@lesliechan721/aw 0.1.0-beta.7 → 0.1.0-beta.9

package/dist/src/commands/catalog-publication-journal.js

@@ -0,0 +1,147 @@
+import crypto from 'node:crypto';
+import path from 'node:path';
+import fs from 'fs-extra';
+function digest(value) {
+    return `sha256:${crypto.createHash('sha256').update(value).digest('hex')}`;
+}
+function canonicalJson(value) {
+    if (Array.isArray(value))
+        return `[${value.map(canonicalJson).join(',')}]`;
+    if (value !== null && typeof value === 'object') {
+        const record = value;
+        return `{${Object.keys(record).sort().map((key) => `${JSON.stringify(key)}:${canonicalJson(record[key])}`).join(',')}}`;
+    }
+    return JSON.stringify(value);
+}
+export function catalogPublicationPlanDigest(descriptor) {
+    return digest(canonicalJson(descriptor));
+}
+export function catalogPublicationJournalPath(workspaceRoot, catalogVersion) {
+    return path.join(workspaceRoot, '.aw', 'publish', `${catalogVersion}.json`);
+}
+export function catalogPublicationRepositoryName(catalogVersion) {
+    return `${catalogVersion}.repo`;
+}
+export function catalogPublicationRepositoryPath(workspaceRoot, catalogVersion) {
+    return path.join(workspaceRoot, '.aw', 'publish', catalogPublicationRepositoryName(catalogVersion));
+}
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function hasExactKeys(value, keys) {
+    const actual = Object.keys(value).sort();
+    const expected = [...keys].sort();
+    return actual.length === expected.length && actual.every((key, index) => key === expected[index]);
+}
+function isDigest(value) {
+    return typeof value === 'string' && /^sha256:[0-9a-f]{64}$/u.test(value);
+}
+function isCommit(value) {
+    return typeof value === 'string' && /^[0-9a-f]{40,64}$/u.test(value);
+}
+function isTimestamp(value) {
+    return typeof value === 'string' && Number.isFinite(Date.parse(value));
+}
+export function isCatalogPublicationDescriptor(value) {
+    if (!isRecord(value) || !hasExactKeys(value, [
+        'schemaVersion', 'workspaceIdentity', 'sourceHead', 'remote', 'branch', 'parent', 'tag',
+        'snapshotDigest',
+    ]))
+        return false;
+    if (!isRecord(value.remote) || !hasExactKeys(value.remote, ['name', 'identityDigest']))
+        return false;
+    return value.schemaVersion === 1
+        && typeof value.workspaceIdentity === 'string'
+        && value.workspaceIdentity !== ''
+        && isCommit(value.sourceHead)
+        && (value.remote.name === null || (typeof value.remote.name === 'string' && value.remote.name !== ''))
+        && isDigest(value.remote.identityDigest)
+        && typeof value.branch === 'string'
+        && value.branch !== ''
+        && (value.parent === null || isCommit(value.parent))
+        && typeof value.tag === 'string'
+        && /^catalog-v\d+\.\d+\.\d+(?:-beta\.\d+)?$/u.test(value.tag)
+        && isDigest(value.snapshotDigest);
+}
+function isDisplayMetadata(value) {
+    return isRecord(value)
+        && hasExactKeys(value, ['catalogVersion', 'channel', 'pluginCount'])
+        && typeof value.catalogVersion === 'string'
+        && (value.channel === 'latest' || value.channel === 'beta')
+        && Number.isSafeInteger(value.pluginCount)
+        && value.pluginCount >= 0;
+}
+export function parseCatalogPublicationJournal(value, catalogVersion) {
+    if (!isRecord(value) || !isCatalogPublicationDescriptor(value.descriptor)) {
+        throw new Error(`Catalog ${catalogVersion} publication journal is damaged. Increase the Catalog version.`);
+    }
+    const commonValid = value.schemaVersion === 1
+        && isDigest(value.planDigest)
+        && value.planDigest === catalogPublicationPlanDigest(value.descriptor)
+        && isCommit(value.expectedCommit)
+        && (value.repository === null || typeof value.repository === 'string')
+        && isDisplayMetadata(value.display)
+        && value.display.catalogVersion === catalogVersion
+        && value.descriptor.tag === `catalog-v${catalogVersion}`
+        && isTimestamp(value.preparedAt);
+    const commonKeys = [
+        'schemaVersion', 'state', 'planDigest', 'descriptor', 'expectedCommit', 'repository', 'display',
+        'preparedAt',
+    ];
+    let shapeValid = false;
+    if (value.state === 'prepared') {
+        shapeValid = hasExactKeys(value, commonKeys);
+    }
+    else if (value.state === 'uncertain') {
+        shapeValid = hasExactKeys(value, [...commonKeys, 'uncertainAt']) && isTimestamp(value.uncertainAt);
+    }
+    else if (value.state === 'published') {
+        shapeValid = hasExactKeys(value, [...commonKeys, 'publishedAt'])
+            && value.repository === null
+            && isTimestamp(value.publishedAt);
+    }
+    if (!commonValid || !shapeValid) {
+        throw new Error(`Catalog ${catalogVersion} publication journal is damaged. Increase the Catalog version.`);
+    }
+    if (value.state !== 'published'
+        && value.repository !== catalogPublicationRepositoryName(catalogVersion)) {
+        throw new Error(`Catalog ${catalogVersion} publication journal is damaged. Increase the Catalog version.`);
+    }
+    return value;
+}
+export async function readCatalogPublicationJournal(filePath, catalogVersion) {
+    if (!(await fs.pathExists(filePath)))
+        return null;
+    try {
+        return parseCatalogPublicationJournal(await fs.readJson(filePath), catalogVersion);
+    }
+    catch (error) {
+        if (error instanceof Error && error.message.includes('publication journal is damaged'))
+            throw error;
+        throw new Error(`Catalog ${catalogVersion} publication journal is damaged. Increase the Catalog version.`, {
+            cause: error,
+        });
+    }
+}
+export async function writeCatalogPublicationJournalAtomic(filePath, journal, exclusive = false) {
+    await fs.ensureDir(path.dirname(filePath));
+    const temporary = path.join(path.dirname(filePath), `.${path.basename(filePath)}.${crypto.randomUUID()}.tmp`);
+    await fs.writeFile(temporary, `${JSON.stringify(journal, null, 2)}\n`, {
+        flag: 'wx',
+        mode: 0o600,
+    });
+    try {
+        if (exclusive) {
+            await fs.link(temporary, filePath);
+            await fs.remove(temporary);
+        }
+        else {
+            await fs.rename(temporary, filePath);
+        }
+    }
+    catch (error) {
+        await fs.remove(temporary);
+        throw error;
+    }
+}
+//# sourceMappingURL=catalog-publication-journal.js.map

package/dist/src/commands/catalog-publication-journal.js.map

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

package/dist/src/commands/catalog-publication-target.d.ts

@@ -0,0 +1,18 @@
+export type CatalogRemoteResolvedFrom = 'explicit' | 'invalid-explicit' | 'origin' | 'sole-remote' | 'ambiguous' | 'unavailable';
+export type CatalogBranchResolvedFrom = 'explicit' | 'default';
+export interface CatalogPublicationTarget {
+    repositoryRoot: string | null;
+    remote: string | null;
+    remoteResolvedFrom: CatalogRemoteResolvedFrom;
+    branch: string;
+    branchResolvedFrom: CatalogBranchResolvedFrom;
+    branchValid: boolean;
+    ambiguous: boolean;
+}
+export declare function resolveCatalogPublicationTarget(options: {
+    workspaceRoot: string;
+    remote?: string;
+    branch?: string;
+    env: NodeJS.ProcessEnv;
+    requireRemote?: boolean;
+}): Promise<CatalogPublicationTarget>;

package/dist/src/commands/catalog-publication-target.js

@@ -0,0 +1,95 @@
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+import { sanitizedGitEnvironment } from './catalog-publication-inspection.js';
+const execFileAsync = promisify(execFile);
+function safeExplicitGitValue(value) {
+    return value !== '' && value === value.trim() && !/^-/u.test(value) && !/[\s\p{Cc}]/u.test(value);
+}
+function safeExplicitBranchValue(value) {
+    return /^[A-Za-z0-9][A-Za-z0-9._/-]*$/u.test(value);
+}
+async function gitAcceptsBranch(cwd, branch, env) {
+    if (!safeExplicitBranchValue(branch))
+        return false;
+    try {
+        await execFileAsync('git', ['check-ref-format', '--branch', branch], {
+            cwd,
+            env: { ...sanitizedGitEnvironment(env), GIT_OPTIONAL_LOCKS: '0' },
+            encoding: 'utf8',
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+async function git(cwd, args, env) {
+    return (await execFileAsync('git', args, {
+        cwd,
+        env: { ...sanitizedGitEnvironment(env), GIT_OPTIONAL_LOCKS: '0' },
+        encoding: 'utf8',
+    })).stdout.trim();
+}
+export async function resolveCatalogPublicationTarget(options) {
+    const branch = options.branch ?? 'catalog';
+    const branchResolvedFrom = options.branch === undefined ? 'default' : 'explicit';
+    const branchValid = options.branch === undefined
+        || await gitAcceptsBranch(options.workspaceRoot, branch, options.env);
+    let repositoryRoot = null;
+    let remotes = [];
+    try {
+        repositoryRoot = await git(options.workspaceRoot, ['rev-parse', '--show-toplevel'], options.env);
+        remotes = (await git(repositoryRoot, ['remote'], options.env)).split('\n').filter(Boolean).sort();
+    }
+    catch {
+        if (options.requireRemote)
+            throw new Error('Catalog publication requires a readable Git worktree and remote.');
+    }
+    let remote = null;
+    let remoteResolvedFrom;
+    if (options.remote !== undefined) {
+        if (safeExplicitGitValue(options.remote) && remotes.includes(options.remote)) {
+            remote = options.remote;
+            remoteResolvedFrom = 'explicit';
+        }
+        else {
+            remoteResolvedFrom = 'invalid-explicit';
+        }
+    }
+    else if (remotes.includes('origin')) {
+        remote = 'origin';
+        remoteResolvedFrom = 'origin';
+    }
+    else if (remotes.length === 1) {
+        remote = remotes[0];
+        remoteResolvedFrom = 'sole-remote';
+    }
+    else if (remotes.length > 1) {
+        remoteResolvedFrom = 'ambiguous';
+    }
+    else {
+        remoteResolvedFrom = 'unavailable';
+    }
+    if (options.requireRemote && remote === null) {
+        if (remoteResolvedFrom === 'invalid-explicit') {
+            throw new Error('Catalog publication remote must name an existing Git remote exactly.');
+        }
+        if (remoteResolvedFrom === 'ambiguous') {
+            throw new Error(`Catalog publication remote is ambiguous: ${remotes.join(', ')}. Use --remote.`);
+        }
+        throw new Error('Catalog publication remote is unavailable. Configure a Git remote or use --remote.');
+    }
+    if (options.requireRemote && !branchValid) {
+        throw new Error('Catalog publication branch is not a safe Git branch name.');
+    }
+    return {
+        repositoryRoot,
+        remote,
+        remoteResolvedFrom,
+        branch,
+        branchResolvedFrom,
+        branchValid,
+        ambiguous: remoteResolvedFrom === 'ambiguous',
+    };
+}
+//# sourceMappingURL=catalog-publication-target.js.map

package/dist/src/commands/catalog-publication-target.js.map

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

package/dist/src/commands/catalog-publish.d.ts

@@ -1,49 +1,92 @@
-import { type CatalogPublicationDescriptor } from './catalog-publication-inspection.js';
+import { type CatalogPublicationPreparation } from './catalog-publication-inspection.js';
+import { type CatalogPublicationDescriptor, type CatalogPublicationJournal } from './catalog-publication-journal.js';
+import { type CatalogBranchResolvedFrom, type CatalogRemoteResolvedFrom } from './catalog-publication-target.js';
+import { type CatalogWorkspaceResolvedFrom } from './catalog-workspace-resolution.js';
+export { catalogPublicationPlanDigest, parseCatalogPublicationJournal, } from './catalog-publication-journal.js';
+export type { CatalogPublicationDescriptor, CatalogPublicationJournal, } from './catalog-publication-journal.js';
 export { safeRemoteIdentity, sanitizedGitEnvironment } from './catalog-publication-inspection.js';
 export interface CatalogPublishIo {
     stdout(text: string): void;
     stderr(text: string): void;
 }
-export interface CatalogPublishReceipt {
-    command: 'catalog:publish';
+interface CatalogPublishReceiptBase {
     ok: true;
+    workspaceRoot: string;
+    workspaceRootResolvedFrom: CatalogWorkspaceResolvedFrom;
     workspaceIdentity: string;
     catalogVersion: string;
     channel: 'latest' | 'beta';
     remote: string;
+    remoteResolvedFrom: CatalogRemoteResolvedFrom;
     remoteUrl: string;
     fetchUrl: string;
     pushUrl: string;
     branch: string;
+    branchResolvedFrom: CatalogBranchResolvedFrom;
     parent: string | null;
     tag: string;
-    commit: string;
+    expectedCommit: string;
     sourceHead: string;
     pluginCount: number;
     snapshotDigest: string;
-    planId: string;
-    descriptorDigest: string;
+    planDigest: string;
+    descriptor: CatalogPublicationDescriptor;
+    journalPath: string;
+    repositoryPath: string | null;
+}
+export interface CatalogPublishPlanReceipt extends CatalogPublishReceiptBase {
+    command: 'catalog:publish:plan';
+    state: CatalogPublicationJournal['state'];
+}
+export interface CatalogPublishApplyReceipt extends CatalogPublishReceiptBase {
+    command: 'catalog:publish:apply';
+    state: 'published';
+    commit: string;
+    reconciliation: 'already-published' | 'already-remote' | 'atomic' | 'tag' | 'branch';
+}
+interface ReceiptResolution {
+    workspaceRootResolvedFrom?: CatalogWorkspaceResolvedFrom;
+    remoteResolvedFrom?: CatalogRemoteResolvedFrom;
+    branchResolvedFrom?: CatalogBranchResolvedFrom;
 }
-export declare function catalogPublicationDescriptorDigest(descriptor: CatalogPublicationDescriptor): string;
-export declare function publishPreparedCatalogPublication(options: {
+interface PublicationTargetOptions {
     workspaceRoot: string;
     remote?: string;
     remoteUrl?: string;
     branch?: string;
-    descriptor: CatalogPublicationDescriptor;
-    snapshotRoot: string;
     env: NodeJS.ProcessEnv;
+}
+export declare function persistCatalogPublicationPlan(options: {
+    preparation: CatalogPublicationPreparation;
+    descriptor?: CatalogPublicationDescriptor;
+    snapshotRoot?: string;
+    workspaceRootResolvedFrom?: CatalogWorkspaceResolvedFrom;
+    remoteResolvedFrom?: CatalogRemoteResolvedFrom;
+    branchResolvedFrom?: CatalogBranchResolvedFrom;
+}): Promise<CatalogPublishPlanReceipt>;
+export declare function prepareCatalogPublicationPlan(options: PublicationTargetOptions & ReceiptResolution): Promise<CatalogPublishPlanReceipt>;
+export declare function applyCatalogPublicationPlan(options: PublicationTargetOptions & {
+    expectedPlanDigest: string;
     beforeRemoteWrite?: () => Promise<void>;
-}): Promise<CatalogPublishReceipt>;
-export declare function runCatalogPublishCommand(options: {
-    workspaceRoot: string;
+} & ReceiptResolution): Promise<CatalogPublishApplyReceipt>;
+export declare function runCatalogPublishPlanCommand(options: {
+    cwd: string;
+    workspaceRoot?: string;
+    remote?: string;
+    branch?: string;
+    env: NodeJS.ProcessEnv;
+    io: CatalogPublishIo;
+}): Promise<CatalogPublishPlanReceipt>;
+export declare function runCatalogPublishApplyCommand(options: {
+    cwd: string;
+    workspaceRoot?: string;
     remote?: string;
     branch?: string;
-    expectedDescriptorDigest?: string;
+    expectedPlanDigest?: string;
     yes?: boolean;
     json?: boolean;
     env: NodeJS.ProcessEnv;
     interactive: boolean;
     confirm?: (message: string) => Promise<boolean>;
     io: CatalogPublishIo;
-}): Promise<CatalogPublishReceipt | null>;
+}): Promise<CatalogPublishApplyReceipt | null>;