@byline/cli 1.6.2 → 1.7.1

package/dist/phases/wire/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/phases/wire/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,KAAK,EAA2B,MAAM,gBAAgB,CAAA;AAKpE,eAAO,MAAM,SAAS,EAAE,KA+CvB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/phases/wire/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAA2B,MAAM,gBAAgB,CAAA;AAiBpE,eAAO,MAAM,SAAS,EAAE,KA+CvB,CAAA"}

package/dist/phases/wire/index.js

@@ -1,9 +1,22 @@
 import { wireRootTsx } from './root-tsx.js';
 import { wireServerTs } from './server-ts.js';
+import { wireServerUploads } from './server-uploads.js';
 import { wireStartTs } from './start-ts.js';
 import { wireTsconfig } from './tsconfig.js';
 import { wireViteConfig } from './vite-config.js';
-const SUB_EDITS = [wireServerTs, wireStartTs, wireRootTsx, wireTsconfig, wireViteConfig];
+// Order matters: `wireServerTs` injects the side-effect import for
+// `byline/server.config` at the top of `src/server.ts`; `wireServerUploads`
+// then runs in the same file to wrap the `fetch` handler with the runtime
+// uploads helper. The two sub-edits are independent, but keeping them
+// adjacent makes the resulting diff easier to read.
+const SUB_EDITS = [
+    wireServerTs,
+    wireServerUploads,
+    wireStartTs,
+    wireRootTsx,
+    wireTsconfig,
+    wireViteConfig,
+];
 export const wirePhase = {
     id: 'wire',
     title: 'Wire — inject imports + path mappings + verify vite.config.ts',

package/dist/phases/wire/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/phases/wire/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/phases/wire/index.ts"],"names":[],"mappings":"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"}

package/dist/phases/wire/server-uploads.d.ts

@@ -0,0 +1,3 @@
+import type { SubEdit } from './shared.js';
+export declare const wireServerUploads: SubEdit;
+//# sourceMappingURL=server-uploads.d.ts.map

package/dist/phases/wire/server-uploads.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server-uploads.d.ts","sourceRoot":"","sources":["../../../src/phases/wire/server-uploads.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,OAAO,EAAiB,MAAM,aAAa,CAAA;AAgBzD,eAAO,MAAM,iBAAiB,EAAE,OAS/B,CAAA"}

package/dist/phases/wire/server-uploads.js

@@ -0,0 +1,195 @@
+import { existsSync, readFileSync } from 'node:fs';
+import { Node, Project, SyntaxKind, } from 'ts-morph';
+const REL = 'src/server.ts';
+const SERVE_UPLOADS_NAME = 'serveUploads';
+const SERVE_UPLOADS_MODULE = '@byline/host-tanstack-start/integrations/serve-uploads';
+const SNIPPET = `import { ${SERVE_UPLOADS_NAME} } from '${SERVE_UPLOADS_MODULE}'
+
+// Inside createServerEntry({ ... }), replace the fetch handler with:
+async fetch(request) {
+  const upload = await ${SERVE_UPLOADS_NAME}(request)
+  if (upload) return upload
+  return handler.fetch(request)
+},
+`;
+export const wireServerUploads = {
+    key: 'server-uploads',
+    title: `Wrap fetch with \`${SERVE_UPLOADS_NAME}\` runtime handler in ${REL}`,
+    async preview(ctx) {
+        return run(ctx, true);
+    },
+    async apply(ctx) {
+        return run(ctx, false);
+    },
+};
+async function run(ctx, dryRun) {
+    const path = ctx.resolve(REL);
+    if (!existsSync(path)) {
+        return { status: 'blocked', message: `${REL} not found — host phase should have caught this` };
+    }
+    // Cheap pre-check: if the helper is already referenced anywhere, we
+    // assume it's wired. Avoids a full AST round-trip on the common
+    // already-wired case and on any non-trivial server.ts the user has
+    // hand-customized to call serveUploads themselves.
+    const text = readFileSync(path, 'utf8');
+    if (text.includes(SERVE_UPLOADS_NAME)) {
+        return { status: 'skipped', message: `${REL}: ${SERVE_UPLOADS_NAME} already wired` };
+    }
+    const project = new Project({ useInMemoryFileSystem: false, skipAddingFilesFromTsConfig: true });
+    let source;
+    try {
+        source = project.addSourceFileAtPath(path);
+    }
+    catch {
+        return manualBail(`${REL}: could not parse`);
+    }
+    const createServerEntryCall = findCreateServerEntryCall(source);
+    if (!createServerEntryCall) {
+        return manualBail(`${REL}: no \`createServerEntry(...)\` call found`);
+    }
+    const optionsLiteral = getFirstObjectArg(createServerEntryCall);
+    if (!optionsLiteral) {
+        return manualBail(`${REL}: \`createServerEntry\` argument is not an inline object literal — cannot safely auto-edit`);
+    }
+    const fetchProp = optionsLiteral.getProperty('fetch');
+    if (!fetchProp) {
+        return manualBail(`${REL}: no \`fetch\` property on \`createServerEntry\` options`);
+    }
+    if (!isCanonicalFetchProperty(fetchProp)) {
+        return manualBail(`${REL}: existing \`fetch\` does not match the canonical scaffold (\`fetch(request) { return handler.fetch(request) }\`) — manual wire required`);
+    }
+    if (dryRun) {
+        return {
+            status: 'done',
+            message: `${REL}: will wrap fetch with ${SERVE_UPLOADS_NAME}`,
+        };
+    }
+    ensureImport(source);
+    replaceFetchMethod(optionsLiteral);
+    source.saveSync();
+    return { status: 'done', message: `${REL}: wrapped fetch with ${SERVE_UPLOADS_NAME}` };
+}
+function manualBail(message) {
+    return { status: 'manual', message, snippet: SNIPPET };
+}
+function findCreateServerEntryCall(source) {
+    // Walk top-level descendants looking for any `createServerEntry(...)`
+    // call. The TanStack Start scaffold exports it via `export default`,
+    // but we accept any position in the file.
+    for (const call of source.getDescendantsOfKind(SyntaxKind.CallExpression)) {
+        if (call.getExpression().getText() === 'createServerEntry')
+            return call;
+    }
+    return undefined;
+}
+function getFirstObjectArg(call) {
+    const args = call.getArguments();
+    if (args.length === 0)
+        return undefined;
+    const first = args[0];
+    if (first && Node.isObjectLiteralExpression(first))
+        return first;
+    return undefined;
+}
+/**
+ * Recognise the canonical TanStack Start scaffold shape so we only edit
+ * a `fetch` we fully understand. Three accepted forms (all equivalent
+ * in behaviour):
+ *
+ *   fetch(request) { return handler.fetch(request) }    // method shorthand
+ *   fetch: (request) => handler.fetch(request)          // arrow w/ expr body
+ *   fetch: (request) => { return handler.fetch(request) }
+ *   fetch: function (request) { return handler.fetch(request) }
+ *
+ * Anything else — extra statements, async, type annotations on the
+ * parameter, a different parameter name, a wrapped/intercepted call —
+ * forces a manual bail.
+ */
+function isCanonicalFetchProperty(prop) {
+    const shape = extractFunctionShape(prop);
+    if (!shape)
+        return false;
+    const { parameters, body } = shape;
+    if (parameters.length !== 1)
+        return false;
+    if (parameters[0]?.getName() !== 'request')
+        return false;
+    if (!body)
+        return false;
+    // Body should evaluate `handler.fetch(request)` — either as the sole
+    // statement of a block (`{ return handler.fetch(request) }`) or as
+    // the bare expression of an arrow function.
+    let returnExpr;
+    if (Node.isBlock(body)) {
+        const stmts = body.getStatements();
+        if (stmts.length !== 1)
+            return false;
+        const only = stmts[0];
+        if (!only || !Node.isReturnStatement(only))
+            return false;
+        returnExpr = only.getExpression();
+    }
+    else {
+        returnExpr = body;
+    }
+    if (!returnExpr || !Node.isCallExpression(returnExpr))
+        return false;
+    // Callee text, whitespace-stripped, must be exactly `handler.fetch`.
+    const callee = returnExpr.getExpression().getText().replace(/\s+/g, '');
+    if (callee !== 'handler.fetch')
+        return false;
+    const callArgs = returnExpr.getArguments();
+    if (callArgs.length !== 1)
+        return false;
+    if (callArgs[0]?.getText() !== 'request')
+        return false;
+    return true;
+}
+function extractFunctionShape(prop) {
+    if (Node.isMethodDeclaration(prop)) {
+        return { parameters: prop.getParameters(), body: prop.getBody() };
+    }
+    if (Node.isPropertyAssignment(prop)) {
+        const init = prop.getInitializer();
+        if (!init)
+            return undefined;
+        if (Node.isArrowFunction(init) || Node.isFunctionExpression(init)) {
+            return { parameters: init.getParameters(), body: init.getBody() };
+        }
+    }
+    return undefined;
+}
+function ensureImport(source) {
+    const existing = source
+        .getImportDeclarations()
+        .find((d) => d.getModuleSpecifierValue() === SERVE_UPLOADS_MODULE);
+    if (existing) {
+        const already = existing.getNamedImports().some((n) => n.getName() === SERVE_UPLOADS_NAME);
+        if (!already)
+            existing.addNamedImport(SERVE_UPLOADS_NAME);
+        return;
+    }
+    // Insert after the last existing import; placement among siblings
+    // doesn't matter for behaviour.
+    const imports = source.getImportDeclarations();
+    source.insertImportDeclaration(imports.length, {
+        moduleSpecifier: SERVE_UPLOADS_MODULE,
+        namedImports: [SERVE_UPLOADS_NAME],
+    });
+}
+function replaceFetchMethod(options) {
+    const existing = options.getProperty('fetch');
+    if (existing)
+        existing.remove();
+    options.addMethod({
+        name: 'fetch',
+        isAsync: true,
+        parameters: [{ name: 'request' }],
+        statements: [
+            `const upload = await ${SERVE_UPLOADS_NAME}(request)`,
+            'if (upload) return upload',
+            'return handler.fetch(request)',
+        ],
+    });
+}
+//# sourceMappingURL=server-uploads.js.map

package/dist/phases/wire/server-uploads.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"server-uploads.js","sourceRoot":"","sources":["../../../src/phases/wire/server-uploads.ts"],"names":[],"mappings":"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"}

package/dist/templates/byline/server.config.ts

@@ -77,8 +77,15 @@ async function buildBylineCore(): Promise<BylineCore<AdminStore>> {
     // Local filesystem — suitable for development and self-hosted
     // deployments. For cloud/production, swap to `@byline/storage-s3`
     // (see the commented example below).
+    //
+    // IMPORTANT: `uploadDir` lives OUTSIDE `public/` on purpose. With
+    // TanStack Start + Nitro, anything under `public/` is snapshotted
+    // into `.output/public/` at build time, and the static handler reads
+    // from that snapshot — so newly-uploaded files 404 until the next
+    // rebuild. Pair this with a runtime `/uploads/*` handler in
+    // `src/server.ts` that streams from `uploadDir` on every request.
     storage: localStorageProvider({
-      uploadDir: './public/uploads',
+      uploadDir: './uploads',
       baseUrl: '/uploads',
     }),
     // S3-compatible alternative (AWS S3 / Cloudflare R2 / MinIO). Replace

package/dist/templates/byline-examples/collections/media/components/media-list-view.tsx

@@ -47,19 +47,6 @@ function formatNumber(n: number, decimalPlaces: number): string {
   })
 }
 
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-
-/**
- * Derive the avif thumbnail URL from the original storageUrl using the same
- * convention as MediaThumbnailCell / the Sharp upload processor.
- *   `/uploads/media/2026/02/img.jpg` → `/uploads/media/2026/02/img-thumbnail.avif`
- */
-function deriveThumbnailUrl(storageUrl: string): string {
-  return storageUrl.replace(/\.[^.]+$/, '-thumbnail.avif')
-}
-
 // ---------------------------------------------------------------------------
 // Order-by config
 // ---------------------------------------------------------------------------
@@ -261,11 +248,8 @@ export function MediaListView({
             {(data.docs as any[]).map((doc) => {
               const fields = doc.fields ?? {}
               const img = fields.image as StoredFileValue | null | undefined
-              const thumbUrl = img?.storageUrl
-                ? img.thumbnailGenerated
-                  ? deriveThumbnailUrl(img.storageUrl)
-                  : img.storageUrl
-                : null
+              const thumbVariant = img?.variants?.find((v) => v.name === 'thumbnail')
+              const thumbUrl = thumbVariant?.storageUrl ?? img?.storageUrl ?? null
 
               const updatedAt = doc.updatedAt ?? null
 

package/dist/templates/byline-examples/collections/media/components/media-thumbnail.tsx

@@ -8,18 +8,6 @@
 
 import type { FormatterProps, StoredFileValue } from '@byline/core'
 
-/**
- * Derive the thumbnail URL from the original storageUrl.
- *
- * Sharp writes variants as siblings of the original file using the naming
- * convention `<basename>-<variantName>.<outputExt>`:
- *   `/uploads/media/2026/02/abc-photo.jpg`
- *   → `/uploads/media/2026/02/abc-photo-thumbnail.avif`
- */
-function deriveThumbnailUrl(storageUrl: string): string {
-  return storageUrl.replace(/\.[^.]+$/, '-thumbnail.avif')
-}
-
 /**
  * FormatBadge renders a muted pill showing the image format (e.g. JPEG, PNG, SVG).
  * Intended for use alongside the status badge in list-view card meta.
@@ -34,7 +22,7 @@ export function FormatBadge({ format }: { format: string }) {
 
 /**
  * MediaThumbnailCell renders a small preview image in the Media list view.
- * When the `thumbnail` variant has been generated, the smaller avif is used;
+ * When a `thumbnail` variant has been generated its `storageUrl` is used;
  * otherwise the original storage URL is shown.
  */
 export function MediaThumbnail({ record }: FormatterProps) {
@@ -50,7 +38,8 @@ export function MediaThumbnail({ record }: FormatterProps) {
     )
   }
 
-  const thumbUrl = img.thumbnailGenerated ? deriveThumbnailUrl(img.storageUrl) : img.storageUrl
+  const thumbVariant = img.variants?.find((v) => v.name === 'thumbnail')
+  const thumbUrl = thumbVariant?.storageUrl ?? img.storageUrl
 
   return (
     <img

package/dist/templates/byline-examples/server.config.ts

@@ -119,11 +119,16 @@ async function buildBylineCore(): Promise<BylineCore<AdminStore>> {
     // addition to) this site-wide default.
     //
     // Local filesystem is suitable for development and self-hosted
-    // deployments. The `uploadDir` is served as a static path at `baseUrl`
-    // by your web server. For cloud/production deployments, swap to
-    // `@byline/storage-s3` — see the commented example below.
+    // deployments. The `uploadDir` is served at `baseUrl` by a runtime
+    // handler in `src/server.ts` — NOT by the framework's static-asset
+    // pipeline. Keeping uploads outside `public/` is what lets newly-
+    // uploaded files appear without a rebuild: `vite build` snapshots
+    // `public/` into `.output/public/`, but the runtime handler reads
+    // `uploadDir` directly on every request. For cloud/production
+    // deployments, swap to `@byline/storage-s3` — see the commented
+    // example below.
     storage: localStorageProvider({
-      uploadDir: './public/uploads',
+      uploadDir: './uploads',
       baseUrl: '/uploads',
     }),
     // S3-compatible alternative (AWS S3 / Cloudflare R2 / MinIO). Replace

package/package.json

@@ -2,7 +2,7 @@
   "name": "@byline/cli",
   "private": false,
   "license": "MPL-2.0",
-  "version": "1.6.2",
+  "version": "1.7.1",
   "engines": {
     "node": ">=20.9.0"
   },