@byline/cli 3.21.0 → 4.0.0

package/dist/workspace-root.test.js

@@ -0,0 +1,307 @@
+import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterEach, describe, expect, it } from 'vitest';
+import { resolveWorkspaceOwnership, validateWorkspacePackageManager, workspaceManagerConstraint, } from './lib/workspace-root.js';
+import { DEP_SPECS } from './manifest/deps.js';
+import { depsPhase } from './phases/deps.js';
+import { detectPackageManager, preflightPhase } from './phases/preflight.js';
+import { buildScaffoldPlan } from './phases/scaffold.js';
+import { createTestContextAt } from './test-helpers.js';
+const roots = [];
+afterEach(() => {
+    for (const root of roots.splice(0))
+        rmSync(root, { recursive: true, force: true });
+});
+describe('workspace root ownership', () => {
+    it('plans root settings and targets a nested pnpm app without creating nested workspace files', async () => {
+        const root = monorepo('pnpm');
+        const app = join(root, 'apps/webapp');
+        const dependencies = compatibleDependencies();
+        delete dependencies.classnames;
+        writeFileSync(join(app, 'package.json'), `${JSON.stringify({ name: '@fixture/webapp', dependencies, scripts: {} }, null, 2)}\n`);
+        writeFileSync(join(root, 'pnpm-workspace.yaml'), 'packages:\n  - apps/*\n');
+        writeFileSync(join(root, 'turbo.json'), '{"tasks":{}}\n');
+        mkdirSync(join(root, '.github/workflows'), { recursive: true });
+        writeFileSync(join(root, '.github/workflows/ci.yml'), 'steps:\n  - run: pnpm typecheck\n');
+        const ctx = createTestContextAt(app, { examples: false });
+        ctx.pm = 'pnpm';
+        expect(ctx.workspaceRoot).toBe(root);
+        const deps = await depsPhase.plan(ctx);
+        expect(deps.writes.some((write) => write.path === join(root, 'pnpm-workspace.yaml'))).toBe(true);
+        expect(deps.writes.some((write) => write.path === join(app, 'pnpm-workspace.yaml'))).toBe(false);
+        expect(deps.commands[0]).toMatchObject({
+            cwd: root,
+            command: 'pnpm',
+            args: ['--filter', './apps/webapp', 'add', 'classnames@^2.5.1'],
+        });
+        const scaffold = buildScaffoldPlan(ctx);
+        expect(scaffold.writes.some((write) => write.path === join(root, 'turbo.json'))).toBe(true);
+        expect(scaffold.writes.some((write) => write.path === join(app, 'package.json'))).toBe(true);
+        expect(scaffold.notes.join('\n')).toContain(join(root, '.github/workflows/ci.yml'));
+    });
+    it('uses pnpm workspace-root mode when the app owns the root', async () => {
+        const root = mkdtempSync(join(tmpdir(), 'byline-pnpm-root-'));
+        roots.push(root);
+        const dependencies = compatibleDependencies();
+        delete dependencies.classnames;
+        writeFileSync(join(root, 'package.json'), `${JSON.stringify({ name: '@fixture/root-app', dependencies })}\n`);
+        const ctx = createTestContextAt(root, { examples: false });
+        ctx.pm = 'pnpm';
+        const command = (await depsPhase.plan(ctx)).commands[0];
+        expect(command).toEqual({
+            command: 'pnpm',
+            args: ['add', '-w', 'classnames@^2.5.1'],
+            cwd: root,
+        });
+    });
+    it.each([
+        ['yarn', 'yarn.lock'],
+        ['npm', 'package-lock.json'],
+        ['bun', 'bun.lock'],
+    ])('detects %s from a workspace ancestor', (manager, lockfile) => {
+        const root = monorepo(manager);
+        writeFileSync(join(root, lockfile), '');
+        expect(detectPackageManager(join(root, 'apps/webapp'))).toBe(manager);
+    });
+    it.each([
+        'yarn',
+        'npm',
+        'bun',
+    ])('synchronizes a completed setup/doctor preflight from persisted %s state', async (manager) => {
+        const root = mkdtempSync(join(tmpdir(), 'byline-persisted-manager-'));
+        roots.push(root);
+        writeFileSync(join(root, 'package.json'), '{"name":"standalone"}\n');
+        const ctx = createTestContextAt(root);
+        ctx.state.patchAnswers({ pm: manager });
+        ctx.state.markPhaseComplete('preflight');
+        ctx.pm = 'pnpm';
+        expect(await preflightPhase.detect(ctx)).toBe('done');
+        expect(ctx.pm).toBe(manager);
+    });
+    it.each([
+        'root',
+        'nested',
+    ])('blocks noninteractive manager defaulting in a package.json-only %s workspace', async (location) => {
+        const root = packageJsonOnlyWorkspace();
+        const cwd = location === 'root' ? root : join(root, 'apps/webapp');
+        mkdirSync(join(cwd, '.git'), { recursive: true });
+        const ctx = createTestContextAt(cwd);
+        expect((await preflightPhase.apply(await preflightPhase.plan(ctx), ctx)).state).toBe('blocked');
+    });
+    it.each([
+        'root',
+        'nested',
+    ])('creates complete pnpm metadata for an explicit package.json-only %s workspace', async (location) => {
+        const root = packageJsonOnlyWorkspace();
+        const cwd = location === 'root' ? root : join(root, 'apps/webapp');
+        mkdirSync(join(cwd, '.git'), { recursive: true });
+        const packagePath = join(cwd, 'package.json');
+        const existing = JSON.parse(readFileSync(packagePath, 'utf8'));
+        writeFileSync(packagePath, `${JSON.stringify({ ...existing, dependencies: compatibleDependencies() })}\n`);
+        const ctx = createTestContextAt(cwd, { examples: false });
+        ctx.cliFlags.pm = 'pnpm';
+        expect((await preflightPhase.apply(await preflightPhase.plan(ctx), ctx)).state).toBe('done');
+        const deps = await depsPhase.plan(ctx);
+        const workspaceWrite = deps.writes.find((write) => write.path === join(root, 'pnpm-workspace.yaml'));
+        expect(workspaceWrite?.contents).toContain('packages:');
+        expect(workspaceWrite?.contents).toContain('apps/*');
+        expect(workspaceWrite?.contents).toContain('allowBuilds:');
+        expect((await depsPhase.apply(deps, ctx)).state).toBe('done');
+        expect(resolveWorkspaceOwnership(cwd)).toMatchObject({ root, kind: 'pnpm' });
+    });
+    it.each([
+        'npm',
+        'yarn',
+        'bun',
+    ])('uses explicit %s in a package.json-only workspace without creating pnpm metadata', async (manager) => {
+        const root = packageJsonOnlyWorkspace();
+        const app = join(root, 'apps/webapp');
+        const dependencies = compatibleDependencies();
+        delete dependencies.classnames;
+        writeFileSync(join(app, 'package.json'), `${JSON.stringify({ name: '@fixture/webapp', dependencies })}\n`);
+        mkdirSync(join(app, '.git'));
+        const ctx = createTestContextAt(app, { examples: false });
+        ctx.cliFlags.pm = manager;
+        expect((await preflightPhase.apply(await preflightPhase.plan(ctx), ctx)).state).toBe('done');
+        const deps = await depsPhase.plan(ctx);
+        expect(deps.writes.some((write) => write.path.endsWith('pnpm-workspace.yaml'))).toBe(false);
+        expect(deps.commands[0]?.command).toBe(manager);
+    });
+    it.each([
+        'yarn',
+        'npm',
+        'bun',
+    ])('targets a nested app safely with %s', async (manager) => {
+        const root = monorepo(manager);
+        const app = join(root, 'apps/webapp');
+        const dependencies = compatibleDependencies();
+        delete dependencies.classnames;
+        writeFileSync(join(app, 'package.json'), `${JSON.stringify({ name: '@fixture/webapp', dependencies })}\n`);
+        const ctx = createTestContextAt(app, { examples: false });
+        ctx.pm = manager;
+        const command = (await depsPhase.plan(ctx)).commands[0];
+        expect(command?.command).toBe(manager);
+        if (manager === 'yarn') {
+            expect(command).toMatchObject({ cwd: root });
+            expect(command?.args.slice(0, 3)).toEqual(['workspace', '@fixture/webapp', 'add']);
+        }
+        else if (manager === 'npm') {
+            expect(command).toMatchObject({ cwd: root });
+            expect(command?.args).toEqual(expect.arrayContaining(['--workspace', './apps/webapp', 'classnames@^2.5.1']));
+        }
+        else {
+            expect(command).toMatchObject({ cwd: app });
+            expect(command?.args).toContain('classnames@^2.5.1');
+        }
+    });
+    it('resolves a bare workspace link from local workspace package metadata', async () => {
+        const root = monorepo('pnpm');
+        const app = join(root, 'apps/webapp');
+        mkdirSync(join(root, 'packages/core'), { recursive: true });
+        writeFileSync(join(root, 'pnpm-workspace.yaml'), 'packages:\n  - apps/*\n  - packages/*\nallowBuilds:\n  "@google/genai": true\n  esbuild: true\n  protobufjs: true\n  sharp: true\n');
+        writeFileSync(join(root, 'packages/core/package.json'), '{"name":"@byline/core","version":"3.21.4"}\n');
+        const dependencies = compatibleDependencies();
+        dependencies['@byline/core'] = 'workspace:*';
+        writeFileSync(join(app, 'package.json'), `${JSON.stringify({ dependencies })}\n`);
+        const ctx = createTestContextAt(app, { examples: false });
+        ctx.pm = 'pnpm';
+        expect(await depsPhase.detect(ctx)).toBe('done');
+    });
+    it('keeps an excluded nested standalone app isolated from an outer pnpm workspace', async () => {
+        const root = monorepo('pnpm');
+        writeFileSync(join(root, 'pnpm-workspace.yaml'), 'packages:\n  - apps/*\n  - "!apps/excluded"\n');
+        writeFileSync(join(root, 'turbo.json'), '{"tasks":{}}\n');
+        mkdirSync(join(root, '.github/workflows'), { recursive: true });
+        writeFileSync(join(root, '.github/workflows/ci.yml'), 'steps:\n  - run: pnpm typecheck\n');
+        const standalone = join(root, 'apps/excluded');
+        mkdirSync(standalone, { recursive: true });
+        const standaloneDependencies = compatibleDependencies();
+        delete standaloneDependencies.classnames;
+        writeFileSync(join(standalone, 'package.json'), `${JSON.stringify({ packageManager: 'npm@11', dependencies: standaloneDependencies })}\n`);
+        const ctx = createTestContextAt(standalone, { examples: false });
+        expect(ctx.workspaceRoot).toBe(standalone);
+        expect(detectPackageManager(standalone)).toBe('npm');
+        const scaffold = buildScaffoldPlan(ctx);
+        expect(scaffold.writes.some((write) => write.path === join(root, 'turbo.json'))).toBe(false);
+        expect(scaffold.notes.join('\n')).not.toContain(join(root, '.github/workflows/ci.yml'));
+        ctx.pm = 'pnpm';
+        const deps = await depsPhase.plan(ctx);
+        expect(deps.writes.some((write) => write.path === join(root, 'pnpm-workspace.yaml'))).toBe(false);
+        expect(deps.writes.some((write) => write.path === join(standalone, 'pnpm-workspace.yaml'))).toBe(true);
+        expect(deps.commands[0]).toMatchObject({ cwd: standalone, command: 'pnpm' });
+        expect(deps.commands[0]?.args).not.toContain('--filter');
+        expect(existsSync(join(standalone, 'pnpm-workspace.yaml'))).toBe(false);
+    });
+    it.each([
+        ['pnpm', 'npm'],
+        ['npm', 'pnpm'],
+        ['yarn', 'npm'],
+        ['bun', 'yarn'],
+    ])('blocks %s workspace use with explicit %s', async (workspaceManager, selected) => {
+        const root = monorepo(workspaceManager);
+        const app = join(root, 'apps/webapp');
+        if (workspaceManager === 'pnpm') {
+            writeFileSync(join(root, 'pnpm-workspace.yaml'), 'packages:\n  - apps/*\n');
+        }
+        writeFileSync(join(app, 'package.json'), '{"name":"@fixture/webapp"}\n');
+        mkdirSync(join(app, '.git'));
+        const ctx = createTestContextAt(app);
+        ctx.cliFlags.pm = selected;
+        const validation = validateWorkspacePackageManager(app, selected);
+        expect(validation).toEqual({
+            valid: false,
+            expected: workspaceManager,
+            reason: `owning workspace uses ${workspaceManager}; use --pm ${workspaceManager}`,
+        });
+        expect((await preflightPhase.apply(await preflightPhase.plan(ctx), ctx)).state).toBe('blocked');
+    });
+    it('uses the authoritative workspace manager instead of prompting for another', async () => {
+        const root = monorepo('yarn');
+        const app = join(root, 'apps/webapp');
+        writeFileSync(join(app, 'package.json'), '{"name":"@fixture/webapp"}\n');
+        mkdirSync(join(app, '.git'));
+        const ctx = createTestContextAt(app);
+        ctx.pm = 'pnpm';
+        expect((await preflightPhase.apply(await preflightPhase.plan(ctx), ctx)).state).toBe('done');
+        expect(ctx.pm).toBe('yarn');
+    });
+    it('blocks a previously prompted manager that conflicts with the workspace', async () => {
+        const root = monorepo('bun');
+        const app = join(root, 'apps/webapp');
+        writeFileSync(join(app, 'package.json'), '{"name":"@fixture/webapp"}\n');
+        mkdirSync(join(app, '.git'));
+        const ctx = createTestContextAt(app);
+        ctx.state.patchAnswers({ pm: 'npm' });
+        expect((await preflightPhase.apply(await preflightPhase.plan(ctx), ctx)).state).toBe('blocked');
+    });
+    it('allows an explicit manager for a standalone app without authoritative metadata', async () => {
+        const root = mkdtempSync(join(tmpdir(), 'byline-standalone-manager-'));
+        roots.push(root);
+        writeFileSync(join(root, 'package.json'), '{"name":"standalone"}\n');
+        mkdirSync(join(root, '.git'));
+        const ctx = createTestContextAt(root);
+        ctx.cliFlags.pm = 'bun';
+        expect((await preflightPhase.apply(await preflightPhase.plan(ctx), ctx)).state).toBe('done');
+        expect(ctx.pm).toBe('bun');
+    });
+    it('blocks ambiguous manager metadata consistently for root and nested apps', async () => {
+        const root = monorepo('npm');
+        const app = join(root, 'apps/webapp');
+        writeFileSync(join(root, 'yarn.lock'), '');
+        const rootConstraint = workspaceManagerConstraint(root);
+        const nestedConstraint = workspaceManagerConstraint(app);
+        expect(rootConstraint).toMatchObject({ authoritative: true, ambiguous: true });
+        expect(nestedConstraint).toEqual(rootConstraint);
+        expect(() => detectPackageManager(app)).toThrow('workspace package manager metadata conflicts');
+    });
+    it('blocks cross-manager dependency plans before creating workspace settings', async () => {
+        const root = monorepo('npm');
+        const app = join(root, 'apps/webapp');
+        writeFileSync(join(app, 'package.json'), `${JSON.stringify({ dependencies: compatibleDependencies() })}\n`);
+        const ctx = createTestContextAt(app, { examples: false });
+        ctx.pm = 'pnpm';
+        const plan = await depsPhase.plan(ctx);
+        expect(plan.writes).toEqual([]);
+        expect(plan.commands).toEqual([]);
+        expect(plan.notes.join('\n')).toContain('owning workspace uses npm; use --pm npm');
+        expect((await depsPhase.apply(plan, ctx)).state).toBe('blocked');
+        expect(existsSync(join(root, 'pnpm-workspace.yaml'))).toBe(false);
+    });
+    it.each([
+        'npm',
+        'yarn',
+    ])('does not emit %s workspace commands inside a pnpm workspace', async (manager) => {
+        const root = monorepo('pnpm');
+        const app = join(root, 'apps/webapp');
+        writeFileSync(join(root, 'pnpm-workspace.yaml'), 'packages:\n  - apps/*\n');
+        const dependencies = compatibleDependencies();
+        delete dependencies.classnames;
+        writeFileSync(join(app, 'package.json'), `${JSON.stringify({ dependencies })}\n`);
+        const ctx = createTestContextAt(app, { examples: false });
+        ctx.pm = manager;
+        const plan = await depsPhase.plan(ctx);
+        expect(plan.commands).toEqual([]);
+        expect(plan.writes).toEqual([]);
+        expect((await depsPhase.apply(plan, ctx)).state).toBe('blocked');
+    });
+});
+function monorepo(packageManager) {
+    const root = mkdtempSync(join(tmpdir(), 'byline-monorepo-'));
+    roots.push(root);
+    mkdirSync(join(root, 'apps/webapp'), { recursive: true });
+    writeFileSync(join(root, 'package.json'), `${JSON.stringify({ private: true, packageManager: `${packageManager}@1.0.0`, workspaces: ['apps/*'] })}\n`);
+    return root;
+}
+function packageJsonOnlyWorkspace() {
+    const root = mkdtempSync(join(tmpdir(), 'byline-package-workspace-'));
+    roots.push(root);
+    mkdirSync(join(root, 'apps/webapp'), { recursive: true });
+    writeFileSync(join(root, 'package.json'), '{"private":true,"workspaces":["apps/*"],"name":"root"}\n');
+    writeFileSync(join(root, 'apps/webapp/package.json'), '{"name":"@fixture/webapp"}\n');
+    return root;
+}
+function compatibleDependencies() {
+    return Object.fromEntries(DEP_SPECS.filter((spec) => !spec.optional).map((spec) => [spec.name, spec.version]));
+}
+//# sourceMappingURL=workspace-root.test.js.map

package/dist/workspace-root.test.js.map

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

package/package.json

@@ -2,7 +2,7 @@
   "name": "@byline/cli",
   "private": false,
   "license": "MPL-2.0",
-  "version": "3.21.0",
+  "version": "4.0.0",
   "engines": {
     "node": ">=20.9.0"
   },
@@ -39,8 +39,10 @@
     "drizzle-orm": "^0.45.2",
     "execa": "^9.6.1",
     "jsonc-parser": "^3.3.1",
+    "minimatch": "^10.2.4",
     "pg": "^8.22.0",
     "picocolors": "^1.1.1",
+    "semver": "^7.7.3",
     "ts-morph": "^28.0.0",
     "yaml": "^2.9.0"
   },
@@ -49,10 +51,16 @@
     "@types/diff": "^8.0.0",
     "@types/node": "^26.1.0",
     "@types/pg": "^8.20.0",
+    "@types/semver": "^7.7.1",
+    "@types/mdast": "^4.0.4",
+    "mdast-util-to-string": "^4.0.0",
+    "remark-gfm": "^4.0.1",
+    "remark-parse": "^11.0.0",
     "rimraf": "^6.1.3",
     "tsc-alias": "^1.9.0",
     "tsx": "^4.23.0",
     "typescript": "^7.0.2",
+    "unified": "^11.0.5",
     "vitest": "^4.1.10"
   },
   "publishConfig": {

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

@@ -1,32 +0,0 @@
-/**
- * This Source Code is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) Infonomic Company Limited
- */
-
-/**
- * Server-only application boundary for the host-owned client singletons.
- * The host stays config-agnostic; this assertion binds it to the app registry.
- */
-import type { BylineClient } from '@byline/client'
-import {
-  getAdminBylineClient as getHostAdminBylineClient,
-  getSystemBylineClient as getHostSystemBylineClient,
-} from '@byline/host-tanstack-start/integrations/byline-client'
-import { getPublicBylineClient as getHostPublicBylineClient } from '@byline/host-tanstack-start/integrations/byline-public-client'
-import {
-  getViewerBylineClient as getHostViewerBylineClient,
-  isPreviewActive,
-} from '@byline/host-tanstack-start/integrations/byline-viewer-client'
-
-import type { BylineCollections } from './collections/index.js'
-
-type AppBylineClient = BylineClient<BylineCollections>
-
-export const getAdminBylineClient = getHostAdminBylineClient as () => AppBylineClient
-export const getPublicBylineClient = getHostPublicBylineClient as () => AppBylineClient
-export const getSystemBylineClient = getHostSystemBylineClient as () => AppBylineClient
-export const getViewerBylineClient = getHostViewerBylineClient as () => AppBylineClient
-export { isPreviewActive }

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

@@ -1,32 +0,0 @@
-/**
- * This Source Code is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) Infonomic Company Limited
- */
-
-/**
- * Server-only application boundary for the host-owned client singletons.
- * The host stays config-agnostic; this assertion binds it to the app registry.
- */
-import type { BylineClient } from '@byline/client'
-import {
-  getAdminBylineClient as getHostAdminBylineClient,
-  getSystemBylineClient as getHostSystemBylineClient,
-} from '@byline/host-tanstack-start/integrations/byline-client'
-import { getPublicBylineClient as getHostPublicBylineClient } from '@byline/host-tanstack-start/integrations/byline-public-client'
-import {
-  getViewerBylineClient as getHostViewerBylineClient,
-  isPreviewActive,
-} from '@byline/host-tanstack-start/integrations/byline-viewer-client'
-
-import type { BylineCollections } from './collections/index.js'
-
-type AppBylineClient = BylineClient<BylineCollections>
-
-export const getAdminBylineClient = getHostAdminBylineClient as () => AppBylineClient
-export const getPublicBylineClient = getHostPublicBylineClient as () => AppBylineClient
-export const getSystemBylineClient = getHostSystemBylineClient as () => AppBylineClient
-export const getViewerBylineClient = getHostViewerBylineClient as () => AppBylineClient
-export { isPreviewActive }