@codefast/cli 0.3.14-canary.0 → 0.3.14-canary.2

package/dist/lib/mirror/{infra/update-pkg.adapter.mjs → infrastructure/package-json-exports.repository.mjs}

@@ -1,7 +1,7 @@
-import { messageFromCaughtUnknown } from "../../core/application/utils/caught-unknown-message.util.mjs";
-import { PACKAGE_JSON_EXPORT } from "../domain/constants.domain.mjs";
+import { messageFromCaughtUnknown } from "../../core/domain/caught-unknown-message.value-object.mjs";
 import { MirrorError, MirrorErrorCode } from "../domain/errors.domain.mjs";
-//#region src/lib/mirror/infra/update-pkg.adapter.ts
+import { PACKAGE_JSON_EXPORT } from "../domain/constants.domain.mjs";
+//#region src/lib/mirror/infrastructure/package-json-exports.repository.ts
 function containsDistTarget(value) {
 	if (typeof value === "string") return value.startsWith("./dist/");
 	if (Array.isArray(value)) return value.some((entryValue) => containsDistTarget(entryValue));
@@ -28,21 +28,6 @@ function compareExportSpecifiers(leftSpecifier, rightSpecifier, originalPathBySp
 	return leftSpecifier.localeCompare(rightSpecifier);
 }
 /**
-* Shared rule: show `package.json#name` when it is a non-empty string; else folder basename.
-*/ function resolvePackageDisplayName(packageJson, folderBasename) {
-	const declaredName = packageJson.name;
-	return typeof declaredName === "string" && declaredName.length > 0 ? declaredName : folderBasename;
-}
-async function readPackageJsonDisplayName(fs, packageJsonPath, folderBasename) {
-	if (!fs.existsSync(packageJsonPath)) return folderBasename;
-	try {
-		const raw = await fs.readFile(packageJsonPath, "utf8");
-		return resolvePackageDisplayName(JSON.parse(raw), folderBasename);
-	} catch {
-		return folderBasename;
-	}
-}
-/**
 * Writes `exports` into `package.json` via a temp file + rename (atomic on same volume).
 * Preserves a trailing newline after JSON.
 */ async function writePackageJsonExportsAtomic(fs, packageJsonPath, mergeInput) {
@@ -101,4 +86,4 @@ async function readPackageJsonDisplayName(fs, packageJsonPath, folderBasename) {
 	return { prunedKeys };
 }
 //#endregion
-export { readPackageJsonDisplayName, resolvePackageDisplayName, writePackageJsonExportsAtomic };
+export { writePackageJsonExportsAtomic };

package/dist/lib/mirror/{infra/workspace-packages.adapter.mjs → infrastructure/workspace-packages.service.mjs}

@@ -1,10 +1,10 @@
-import { messageFromCaughtUnknown } from "../../core/application/utils/caught-unknown-message.util.mjs";
-import { normalizePath } from "./path-normalizer.adapter.mjs";
+import { messageFromCaughtUnknown } from "../../core/domain/caught-unknown-message.value-object.mjs";
+import { normalizePath } from "../domain/path-normalizer.value-object.mjs";
 import { globSync } from "node:fs";
 import path from "node:path";
 import picomatch from "picomatch";
 import { parse } from "yaml";
-//#region src/lib/mirror/infra/workspace-packages.adapter.ts
+//#region src/lib/mirror/infrastructure/workspace-packages.service.ts
 const PNPM_WORKSPACE = "pnpm-workspace.yaml";
 /**
 * Default when the workspace file is missing or has no `packages` key.
@@ -155,4 +155,4 @@ async function readWorkspaceYaml(rootDir, fs) {
 	};
 }
 //#endregion
-export { findWorkspacePackageRelPaths, parsePnpmWorkspaceDocument, splitWorkspacePackageEntries, workspacePatternToPackageJsonGlob };
+export { findWorkspacePackageRelPaths };

package/dist/lib/mirror/mirror.module.mjs

@@ -1,22 +1,24 @@
-import { CliLoggerToken } from "../core/operational/contracts/tokens.mjs";
-import { withOptionalPortTelemetry } from "../core/infra/logging-decorator.adapter.mjs";
-import { InfraModule } from "../core/infra/infra.module.mjs";
-import { FileSystemServicePortToken, MirrorSyncReporterPortToken, PackageRepositoryPortToken, RunMirrorSyncUseCaseToken, SyncWorkspacePackageServiceToken, WorkspaceServicePortToken } from "./contracts/tokens.mjs";
-import { SyncWorkspacePackageServiceImpl as _SyncWorkspacePackageServiceImpl } from "./application/services/sync-workspace-package.service.mjs";
+import { CliLoggerToken } from "../core/contracts/tokens.mjs";
+import { withOptionalPortTelemetry } from "../core/infrastructure/port-telemetry.decorator.mjs";
+import { InfrastructureModule } from "../core/infrastructure/infrastructure.module.mjs";
+import { FileSystemServicePortToken, MirrorSyncReporterPortToken, PackageRepositoryPortToken, PrepareMirrorSyncUseCaseToken, RunMirrorSyncUseCaseToken, SyncWorkspacePackagePortToken, WorkspaceServicePortToken } from "./contracts/tokens.mjs";
+import { FileSystemServiceAdapter as _FileSystemServiceAdapter } from "./adapters/secondary/file-system-service.adapter.mjs";
+import { MirrorSyncReporterAdapter as _MirrorSyncReporterAdapter } from "./adapters/secondary/mirror-sync-reporter.adapter.mjs";
+import { PackageRepositoryAdapter as _PackageRepositoryAdapter } from "./adapters/secondary/package-repository.adapter.mjs";
+import { SyncWorkspacePackageAdapter as _SyncWorkspacePackageAdapter } from "./adapters/secondary/sync-workspace-package.adapter.mjs";
+import { WorkspaceServiceAdapter as _WorkspaceServiceAdapter } from "./adapters/secondary/workspace-service.adapter.mjs";
+import { PrepareMirrorSyncUseCaseImpl as _PrepareMirrorSyncUseCaseImpl } from "./application/use-cases/prepare-mirror-sync.use-case.mjs";
 import { RunMirrorSyncUseCaseImpl as _RunMirrorSyncUseCaseImpl } from "./application/use-cases/run-mirror-sync.use-case.mjs";
-import { FileSystemServiceAdapter as _FileSystemServiceAdapter } from "./infra/file-system-service.adapter.mjs";
-import { MirrorSyncReporterAdapter as _MirrorSyncReporterAdapter } from "./infra/mirror-sync-reporter.adapter.mjs";
-import { PackageRepositoryAdapter as _PackageRepositoryAdapter } from "./infra/package-repository.adapter.mjs";
-import { WorkspaceServiceAdapter as _WorkspaceServiceAdapter } from "./infra/workspace-service.adapter.mjs";
 import { Module } from "@codefast/di";
 //#region src/lib/mirror/mirror.module.ts
 const MirrorModule = Module.create("cli-mirror", (moduleBuilder) => {
-	moduleBuilder.import(InfraModule);
-	moduleBuilder.bind(WorkspaceServicePortToken).to(_WorkspaceServiceAdapter).onActivation((ctx, implementation) => withOptionalPortTelemetry("WorkspaceServicePort", implementation, ctx.resolve(CliLoggerToken))).singleton();
-	moduleBuilder.bind(PackageRepositoryPortToken).to(_PackageRepositoryAdapter).onActivation((ctx, implementation) => withOptionalPortTelemetry("PackageRepositoryPort", implementation, ctx.resolve(CliLoggerToken))).singleton();
-	moduleBuilder.bind(FileSystemServicePortToken).to(_FileSystemServiceAdapter).onActivation((ctx, implementation) => withOptionalPortTelemetry("FileSystemServicePort", implementation, ctx.resolve(CliLoggerToken))).singleton();
-	moduleBuilder.bind(MirrorSyncReporterPortToken).to(_MirrorSyncReporterAdapter).onActivation((ctx, implementation) => withOptionalPortTelemetry("MirrorSyncReporterPort", implementation, ctx.resolve(CliLoggerToken))).singleton();
-	moduleBuilder.bind(SyncWorkspacePackageServiceToken).to(_SyncWorkspacePackageServiceImpl).singleton();
+	moduleBuilder.import(InfrastructureModule);
+	moduleBuilder.bind(WorkspaceServicePortToken).to(_WorkspaceServiceAdapter).singleton().onActivation((ctx, implementation) => withOptionalPortTelemetry("WorkspaceServicePort", implementation, ctx.resolve(CliLoggerToken)));
+	moduleBuilder.bind(PackageRepositoryPortToken).to(_PackageRepositoryAdapter).singleton().onActivation((ctx, implementation) => withOptionalPortTelemetry("PackageRepositoryPort", implementation, ctx.resolve(CliLoggerToken)));
+	moduleBuilder.bind(FileSystemServicePortToken).to(_FileSystemServiceAdapter).singleton().onActivation((ctx, implementation) => withOptionalPortTelemetry("FileSystemServicePort", implementation, ctx.resolve(CliLoggerToken)));
+	moduleBuilder.bind(MirrorSyncReporterPortToken).to(_MirrorSyncReporterAdapter).singleton().onActivation((ctx, implementation) => withOptionalPortTelemetry("MirrorSyncReporterPort", implementation, ctx.resolve(CliLoggerToken)));
+	moduleBuilder.bind(SyncWorkspacePackagePortToken).to(_SyncWorkspacePackageAdapter).singleton();
+	moduleBuilder.bind(PrepareMirrorSyncUseCaseToken).to(_PrepareMirrorSyncUseCaseImpl).singleton();
 	moduleBuilder.bind(RunMirrorSyncUseCaseToken).to(_RunMirrorSyncUseCaseImpl).singleton();
 });
 //#endregion

package/dist/lib/mirror/presentation/{mirror-cli-schema.presenter.mjs → mirror-cli.schema.mjs}

@@ -1,5 +1,5 @@
 import { z } from "zod";
-//#region src/lib/mirror/presentation/mirror-cli-schema.presenter.ts
+//#region src/lib/mirror/presentation/mirror-cli.schema.ts
 const mirrorSyncRunRequestSchema = z.object({
 	rootDir: z.string().min(1),
 	verbose: z.boolean().optional(),

package/dist/lib/shared/source-code/domain/text-edit.model.mjs

@@ -1,12 +1,15 @@
 //#region src/lib/shared/source-code/domain/text-edit.model.ts
 /**
 * Pure string utilities for applying non-overlapping text edits and reading line indentation.
-*/ /**
-* Returns only the leading whitespace (tabs / spaces) of the line containing `pos`.
-*/ function indentOfLineContaining(source, pos) {
+*/ function lineStartIndexContaining(source, pos) {
 	const searchPos = Math.max(0, Math.min(pos, source.length));
 	const prevLineBreak = Math.max(source.lastIndexOf("\n", searchPos - 1), source.lastIndexOf("\r", searchPos - 1));
-	const lineStart = prevLineBreak === -1 ? 0 : prevLineBreak + 1;
+	return prevLineBreak === -1 ? 0 : prevLineBreak + 1;
+}
+/**
+* Returns only the leading whitespace (tabs / spaces) of the line containing `pos`.
+*/ function indentOfLineContaining(source, pos) {
+	const lineStart = lineStartIndexContaining(source, pos);
 	let lineEnd = source.length;
 	for (let i = lineStart; i < source.length; i++) {
 		const ch = source[i];
@@ -18,6 +21,30 @@
 	const line = source.slice(lineStart, lineEnd);
 	return /^[\t ]*/.exec(line)?.[0] ?? "";
 }
+/**
+* Source slice `[lineStart, pos)` for the line containing `pos`. Aligns continuation lines with
+* a token not at column 0 (e.g. `base: ["foo"` → prefix before the opening `"` of `"foo"`).
+*/ function textPrefixFromLineStartToPosition(source, pos) {
+	const searchPos = Math.max(0, Math.min(pos, source.length));
+	return source.slice(lineStartIndexContaining(source, pos), searchPos);
+}
+/**
+* If `tokenEnd` is followed by optional ASCII whitespace then `,`, returns the index after that
+* comma. Otherwise returns `tokenEnd`. Useful when a replacement already ends with `,` and the
+* following source comma must be absorbed.
+*/ function endAfterOptionalCommaFollowingInSource(source, tokenEnd) {
+	let index = tokenEnd;
+	while (index < source.length) {
+		const ch = source[index];
+		if (ch === " " || ch === "	" || ch === "\n" || ch === "\r") {
+			index += 1;
+			continue;
+		}
+		if (ch === ",") return index + 1;
+		break;
+	}
+	return tokenEnd;
+}
 function applyEditsDescending(sourceText, edits) {
 	const sorted = [...edits].sort((editA, editB) => editB.start - editA.start);
 	let out = sourceText;
@@ -25,4 +52,4 @@ function applyEditsDescending(sourceText, edits) {
 	return out;
 }
 //#endregion
-export { applyEditsDescending, indentOfLineContaining };
+export { applyEditsDescending, endAfterOptionalCommaFollowingInSource, indentOfLineContaining, textPrefixFromLineStartToPosition };

package/dist/lib/shared/source-code/{infra/tsx-file-walk.adapter.mjs → infrastructure/typescript-source-file-walker.service.mjs}

@@ -1,5 +1,5 @@
 import path from "node:path";
-//#region src/lib/shared/source-code/infra/tsx-file-walk.adapter.ts
+//#region src/lib/shared/source-code/infrastructure/typescript-source-file-walker.service.ts
 const DEFAULT_SKIP_DIRS = new Set([
 	"node_modules",
 	"dist",
@@ -30,4 +30,4 @@ function walkTsxFiles(rootDirectoryPath, fs) {
 	return result;
 }
 //#endregion
-export { DEFAULT_SKIP_DIRS, walkTsxFiles };
+export { walkTsxFiles };

package/dist/lib/tag/adapters/primary/cli/presentation.tokens.mjs

@@ -0,0 +1,6 @@
+import { token } from "@codefast/di";
+//#region src/lib/tag/adapters/primary/cli/presentation.tokens.ts
+const PresentTagSyncResultPresenterToken = token("PresentTagSyncResultPresenter");
+const TagSyncProgressListenerToken = token("TagSyncProgressListener");
+//#endregion
+export { PresentTagSyncResultPresenterToken, TagSyncProgressListenerToken };

package/dist/{commands/tag.mjs → lib/tag/adapters/primary/cli/tag.command.mjs}

@@ -1,13 +1,13 @@
-import { CliLoggerToken } from "../lib/core/operational/contracts/tokens.mjs";
-import { parseWithCliSchema } from "../lib/core/presentation/parse-cli-schema.presenter.mjs";
-import { consumeCliAppError } from "../lib/core/presentation/cli-executor.presenter.mjs";
-import { exitCodeForTagSyncResult } from "../lib/tag/application/tag-sync-cli-result.mjs";
-import { formatTagSyncJsonOutput } from "../lib/tag/application/tag-sync-json.format.mjs";
-import { CreateTagProgressListenerPresenterToken, PrepareTagOrchestratorToken, PresentTagSyncResultPresenterToken, RunTagSyncUseCaseToken } from "../lib/tag/contracts/tokens.mjs";
-import { tagSyncRunRequestSchema } from "../lib/tag/presentation/tag-cli-schema.presenter.mjs";
-import process from "node:process";
+import { CliLoggerToken, CliRuntimeToken } from "../../../../core/contracts/tokens.mjs";
+import { parseWithCliSchema } from "../../../../core/presentation/cli-schema.parser.mjs";
+import { consumeCliAppError } from "../../../../core/presentation/cli-executor.presenter.mjs";
+import { exitCodeForTagSyncResult } from "../../../application/tag-sync-cli-result.mjs";
+import { formatTagSyncJsonOutput } from "../../../application/tag-sync-json.format.mjs";
+import { PrepareTagSyncUseCaseToken, RunTagSyncUseCaseToken } from "../../../contracts/tokens.mjs";
+import { tagSyncRunRequestSchema } from "../../../presentation/tag-cli.schema.mjs";
+import { PresentTagSyncResultPresenterToken, TagSyncProgressListenerToken } from "./presentation.tokens.mjs";
 import { inject, injectable } from "@codefast/di";
-//#region src/commands/tag.ts
+//#region src/lib/tag/adapters/primary/cli/tag.command.ts
 function toPrimitive(input, hint) {
 	if (typeof input !== "object" || input === null) return input;
 	var prim = input[Symbol.toPrimitive];
@@ -220,26 +220,29 @@ function _apply_decs_2311(targetClass, classDecs, memberDecs, classDecsHaveThis,
 let _dec, _initClass;
 _dec = injectable([
 	inject(CliLoggerToken),
-	inject(PrepareTagOrchestratorToken),
+	inject(CliRuntimeToken),
+	inject(PrepareTagSyncUseCaseToken),
 	inject(RunTagSyncUseCaseToken),
-	inject(CreateTagProgressListenerPresenterToken),
+	inject(TagSyncProgressListenerToken),
 	inject(PresentTagSyncResultPresenterToken)
 ]);
 let _TagCommand;
 (class {
 	logger;
+	runtime;
 	prepareTagSync;
 	runTagSync;
-	createProgressListener;
+	tagProgressListener;
 	presentSyncCliResult;
 	static {
 		({c: [_TagCommand, _initClass]} = _apply_decs_2311(this, [_dec], []));
 	}
-	constructor(logger, prepareTagSync, runTagSync, createProgressListener, presentSyncCliResult) {
+	constructor(logger, runtime, prepareTagSync, runTagSync, tagProgressListener, presentSyncCliResult) {
 		this.logger = logger;
+		this.runtime = runtime;
 		this.prepareTagSync = prepareTagSync;
 		this.runTagSync = runTagSync;
-		this.createProgressListener = createProgressListener;
+		this.tagProgressListener = tagProgressListener;
 		this.presentSyncCliResult = presentSyncCliResult;
 	}
 	name = "tag";
@@ -247,11 +250,10 @@ let _TagCommand;
 	register(program) {
 		program.command(this.name).alias("annotate").description(this.description).argument("[target]", "Directory or file to annotate (default: auto-discover workspace packages)").option("--dry-run", "Show summary without writing files", false).option("--json", "Print one JSON summary on stdout (suppresses human progress)", false).action(this.execute.bind(this));
 	}
-	async execute(target, options, command) {
+	async execute(target, options, _command) {
 		const prelude = await this.prepareTagSync.execute({
-			currentWorkingDirectory: process.cwd(),
-			rawTarget: target,
-			globalCliRaw: command.optsWithGlobals()
+			currentWorkingDirectory: this.runtime.cwd(),
+			rawTarget: target
 		});
 		if (!consumeCliAppError(this.logger, prelude)) return;
 		const { rootDir, config, resolvedTargetPath } = prelude.value;
@@ -267,13 +269,13 @@ let _TagCommand;
 		if (!consumeCliAppError(this.logger, parsed)) return;
 		const tagOutcome = await this.runTagSync.execute({
 			...parsed.value,
-			listener: parsed.value.json ? void 0 : this.createProgressListener.create((line) => this.logger.out(line))
+			listener: parsed.value.json ? void 0 : this.tagProgressListener
 		});
 		if (!consumeCliAppError(this.logger, tagOutcome)) return;
 		if (parsed.value.json) {
 			this.logger.out(formatTagSyncJsonOutput(tagOutcome.value, rootDir));
-			process.exitCode = exitCodeForTagSyncResult(tagOutcome.value);
-		} else process.exitCode = this.presentSyncCliResult.present(tagOutcome.value, rootDir);
+			this.runtime.setExitCode(exitCodeForTagSyncResult(tagOutcome.value));
+		} else this.runtime.setExitCode(this.presentSyncCliResult.present(tagOutcome.value, rootDir));
 	}
 	static {
 		_initClass();

package/dist/lib/tag/adapters/primary/cli/tag.presentation.module.mjs

@@ -0,0 +1,13 @@
+import { PresentationModule } from "../../../../core/presentation/presentation.module.mjs";
+import { PresentTagSyncResultPresenterToken, TagSyncProgressListenerToken } from "./presentation.tokens.mjs";
+import { PresentTagSyncResultPresenterImpl as _PresentTagSyncResultPresenterImpl } from "../../../presentation/present-tag-sync-result.presenter.mjs";
+import { TagSyncProgressListener as _TagSyncProgressListener } from "../../../presentation/tag-sync-progress-listener.presenter.mjs";
+import { Module } from "@codefast/di";
+//#region src/lib/tag/adapters/primary/cli/tag.presentation.module.ts
+const TagPresentationModule = Module.create("cli-tag-presentation", (moduleBuilder) => {
+	moduleBuilder.import(PresentationModule);
+	moduleBuilder.bind(PresentTagSyncResultPresenterToken).to(_PresentTagSyncResultPresenterImpl).singleton();
+	moduleBuilder.bind(TagSyncProgressListenerToken).to(_TagSyncProgressListener).singleton();
+});
+//#endregion
+export { TagPresentationModule };

package/dist/lib/tag/{infra → adapters/secondary}/tag-since-writer.adapter.mjs

@@ -1,7 +1,8 @@
-import { applyEditsDescending, indentOfLineContaining } from "../../shared/source-code/domain/text-edit.model.mjs";
-import { injectable } from "@codefast/di";
+import { CliFsToken } from "../../../core/contracts/tokens.mjs";
+import { applyEditsDescending, indentOfLineContaining } from "../../../shared/source-code/domain/text-edit.model.mjs";
+import { inject, injectable } from "@codefast/di";
 import ts from "typescript";
-//#region src/lib/tag/infra/tag-since-writer.adapter.ts
+//#region src/lib/tag/adapters/secondary/tag-since-writer.adapter.ts
 function toPrimitive(input, hint) {
 	if (typeof input !== "object" || input === null) return input;
 	var prim = input[Symbol.toPrimitive];
@@ -311,14 +312,18 @@ function makeDeclarationSinceLine(declaration, sf, sourceText, version) {
 		replacement: `${indent}${makeSinceOnlyJSDocBlock(indent, version)}\n${indent}`
 	};
 }
-_dec = injectable([]);
+_dec = injectable([inject(CliFsToken)]);
 let _TagSinceWriterAdapter;
 (class {
+	fs;
 	static {
 		({c: [_TagSinceWriterAdapter, _initClass]} = _apply_decs_2311(this, [_dec], []));
 	}
-	applySinceTagsToFile(filePath, version, fs, write) {
-		const sourceText = fs.readFileSync(filePath, "utf8");
+	constructor(fs) {
+		this.fs = fs;
+	}
+	applySinceTagsToFile(filePath, version, write) {
+		const sourceText = this.fs.readFileSync(filePath, "utf8");
 		const sf = ts.createSourceFile(filePath, sourceText, ts.ScriptTarget.Latest, true, filePath.endsWith(".tsx") ? ts.ScriptKind.TSX : ts.ScriptKind.TS);
 		const edits = [];
 		for (const declaration of collectExportedDeclarations(sf)) {
@@ -327,7 +332,7 @@ let _TagSinceWriterAdapter;
 		}
 		if (edits.length > 0 && write) {
 			const updated = applyEditsDescending(sourceText, edits);
-			fs.writeFileSync(filePath, updated, "utf8");
+			this.fs.writeFileSync(filePath, updated, "utf8");
 		}
 		return {
 			filePath,

package/dist/lib/tag/{infra → adapters/secondary}/tag-target-resolver.adapter.mjs

@@ -1,6 +1,7 @@
-import { resolveTagTargetCandidates } from "./tag-target-candidates.adapter.mjs";
-import { injectable } from "@codefast/di";
-//#region src/lib/tag/infra/tag-target-resolver.adapter.ts
+import { CliFsToken } from "../../../core/contracts/tokens.mjs";
+import { resolveTagTargetCandidates } from "../../infrastructure/tag-target-candidates.adapter.mjs";
+import { inject, injectable } from "@codefast/di";
+//#region src/lib/tag/adapters/secondary/tag-target-resolver.adapter.ts
 function toPrimitive(input, hint) {
 	if (typeof input !== "object" || input === null) return input;
 	var prim = input[Symbol.toPrimitive];
@@ -211,13 +212,19 @@ function _apply_decs_2311(targetClass, classDecs, memberDecs, classDecsHaveThis,
 	};
 }
 let _dec, _initClass;
-_dec = injectable([]);
+_dec = injectable([inject(CliFsToken)]);
 let _TagTargetResolverAdapter;
 (class {
+	fs;
 	static {
 		({c: [_TagTargetResolverAdapter, _initClass]} = _apply_decs_2311(this, [_dec], []));
 	}
-	resolveTagTargetCandidates = resolveTagTargetCandidates;
+	constructor(fs) {
+		this.fs = fs;
+	}
+	resolveTagTargetCandidates(rootDir, explicitTarget) {
+		return resolveTagTargetCandidates(rootDir, explicitTarget, this.fs);
+	}
 	static {
 		_initClass();
 	}

package/dist/lib/tag/{infra → adapters/secondary}/tag-version-resolver.adapter.mjs

@@ -1,6 +1,6 @@
-import { CliPathToken } from "../../core/operational/contracts/tokens.mjs";
+import { CliFsToken, CliPathToken } from "../../../core/contracts/tokens.mjs";
 import { inject, injectable } from "@codefast/di";
-//#region src/lib/tag/infra/tag-version-resolver.adapter.ts
+//#region src/lib/tag/adapters/secondary/tag-version-resolver.adapter.ts
 function toPrimitive(input, hint) {
 	if (typeof input !== "object" || input === null) return input;
 	var prim = input[Symbol.toPrimitive];
@@ -212,23 +212,25 @@ function _apply_decs_2311(targetClass, classDecs, memberDecs, classDecsHaveThis,
 }
 let _dec, _initClass;
 const PACKAGE_JSON = "package.json";
-_dec = injectable([inject(CliPathToken)]);
+_dec = injectable([inject(CliPathToken), inject(CliFsToken)]);
 let _TagVersionResolverAdapter;
 (class {
 	path;
+	fs;
 	static {
 		({c: [_TagVersionResolverAdapter, _initClass]} = _apply_decs_2311(this, [_dec], []));
 	}
-	constructor(path) {
+	constructor(path, fs) {
 		this.path = path;
+		this.fs = fs;
 	}
-	resolveNearestPackageVersion(targetPath, fs) {
+	resolveNearestPackageVersion(targetPath) {
 		const resolved = this.path.resolve(targetPath);
-		let current = fs.statSync(resolved).isDirectory() ? resolved : this.path.dirname(resolved);
+		let current = this.fs.statSync(resolved).isDirectory() ? resolved : this.path.dirname(resolved);
 		while (true) {
 			const packageJsonPath = this.path.join(current, PACKAGE_JSON);
-			if (fs.existsSync(packageJsonPath)) {
-				const raw = fs.readFileSync(packageJsonPath, "utf8");
+			if (this.fs.existsSync(packageJsonPath)) {
+				const raw = this.fs.readFileSync(packageJsonPath, "utf8");
 				const version = JSON.parse(raw).version;
 				if (typeof version === "string" && version.length > 0) return version;
 				throw new Error(`Missing or invalid version in ${packageJsonPath}`);

package/dist/lib/tag/{infra → adapters/secondary}/typescript-tree-walk.adapter.mjs

@@ -1,6 +1,7 @@
-import { walkTsxFiles } from "../../shared/source-code/infra/tsx-file-walk.adapter.mjs";
-import { injectable } from "@codefast/di";
-//#region src/lib/tag/infra/typescript-tree-walk.adapter.ts
+import { CliFsToken } from "../../../core/contracts/tokens.mjs";
+import { walkTsxFiles } from "../../../shared/source-code/infrastructure/typescript-source-file-walker.service.mjs";
+import { inject, injectable } from "@codefast/di";
+//#region src/lib/tag/adapters/secondary/typescript-tree-walk.adapter.ts
 function toPrimitive(input, hint) {
 	if (typeof input !== "object" || input === null) return input;
 	var prim = input[Symbol.toPrimitive];
@@ -211,13 +212,19 @@ function _apply_decs_2311(targetClass, classDecs, memberDecs, classDecsHaveThis,
 	};
 }
 let _dec, _initClass;
-_dec = injectable([]);
+_dec = injectable([inject(CliFsToken)]);
 let _TypeScriptTreeWalkAdapter;
 (class {
+	fs;
 	static {
 		({c: [_TypeScriptTreeWalkAdapter, _initClass]} = _apply_decs_2311(this, [_dec], []));
 	}
-	walkTsxFiles = walkTsxFiles;
+	constructor(fs) {
+		this.fs = fs;
+	}
+	walkTsxFiles(rootDirectoryPath) {
+		return walkTsxFiles(rootDirectoryPath, this.fs);
+	}
 	static {
 		_initClass();
 	}

package/dist/lib/tag/{presentation/resolve-tag-cli-target.presenter.mjs → application/services/tag-cli-target-path-resolver.service.mjs}

@@ -1,5 +1,5 @@
 import path from "node:path";
-//#region src/lib/tag/presentation/resolve-tag-cli-target.presenter.ts
+//#region src/lib/tag/application/services/tag-cli-target-path-resolver.service.ts
 function resolveTagCliTargetPath(input) {
 	if (input.rawTarget === void 0) return;
 	const candidate = path.isAbsolute(input.rawTarget) ? path.resolve(input.rawTarget) : path.resolve(input.currentWorkingDirectory, input.rawTarget);

package/dist/lib/tag/application/services/tag-target-runner.service.mjs

@@ -0,0 +1,21 @@
+//#region src/lib/tag/application/services/tag-target-runner.service.ts
+function resolveNearestPackageVersion(targetPath, versionResolver) {
+	return versionResolver.resolveNearestPackageVersion(targetPath);
+}
+function runTagOnTarget(targetPath, opts, fs, pathService, versionResolver, sinceWriter, typeScriptTreeWalk) {
+	const resolvedTarget = pathService.resolve(targetPath);
+	const version = resolveNearestPackageVersion(resolvedTarget, versionResolver);
+	const tsFiles = (fs.statSync(resolvedTarget).isDirectory() ? typeScriptTreeWalk.walkTsxFiles(resolvedTarget) : [resolvedTarget]).filter((filePath) => filePath.endsWith(".ts") || filePath.endsWith(".tsx"));
+	const fileResults = tsFiles.map((filePath) => sinceWriter.applySinceTagsToFile(filePath, version, opts.write));
+	const filesChanged = fileResults.filter((result) => result.changed).length;
+	const taggedDeclarations = fileResults.reduce((sum, result) => sum + result.taggedDeclarations, 0);
+	return {
+		version,
+		filesScanned: tsFiles.length,
+		filesChanged,
+		taggedDeclarations,
+		fileResults
+	};
+}
+//#endregion
+export { runTagOnTarget };

package/dist/lib/tag/{presentation/prepare-tag.orchestrator.mjs → application/use-cases/prepare-tag-sync.use-case.mjs}

@@ -1,12 +1,8 @@
-import { CliFsToken, CliLoggerToken } from "../../core/operational/contracts/tokens.mjs";
-import { ok } from "../../core/domain/result.model.mjs";
-import { findRepoRoot } from "../../infra/workspace/repo-root.adapter.mjs";
-import { TryLoadCodefastConfigPresenterToken } from "../../core/contracts/tokens.mjs";
-import { parseGlobalCliOptions } from "../../core/presentation/global-cli-options.presenter.mjs";
-import { resolveTagCliTargetPath } from "./resolve-tag-cli-target.presenter.mjs";
-import { resolveTagWorkspaceRootPath } from "./resolve-tag-workspace-root.presenter.mjs";
+import { CliFsToken, LoadCodefastConfigUseCaseToken, RepoRootResolverPortToken } from "../../../core/contracts/tokens.mjs";
+import { ok } from "../../../core/domain/result.model.mjs";
+import { resolveTagCliTargetPath } from "../services/tag-cli-target-path-resolver.service.mjs";
 import { inject, injectable } from "@codefast/di";
-//#region src/lib/tag/presentation/prepare-tag.orchestrator.ts
+//#region src/lib/tag/application/use-cases/prepare-tag-sync.use-case.ts
 function toPrimitive(input, hint) {
 	if (typeof input !== "object" || input === null) return input;
 	var prim = input[Symbol.toPrimitive];
@@ -217,33 +213,37 @@ function _apply_decs_2311(targetClass, classDecs, memberDecs, classDecsHaveThis,
 	};
 }
 let _dec, _initClass;
+function resolveTagWorkspaceRootPath(args) {
+	try {
+		return args.repoRootResolver.findRepoRoot(args.currentWorkingDirectory);
+	} catch {
+		return args.currentWorkingDirectory;
+	}
+}
 _dec = injectable([
 	inject(CliFsToken),
-	inject(CliLoggerToken),
-	inject(TryLoadCodefastConfigPresenterToken)
+	inject(RepoRootResolverPortToken),
+	inject(LoadCodefastConfigUseCaseToken)
 ]);
-let _PrepareTagOrchestrator;
+let _PrepareTagSyncUseCaseImpl;
 (class {
 	fs;
-	logger;
-	tryLoadCodefastConfig;
+	repoRootResolver;
+	loadCodefastConfig;
 	static {
-		({c: [_PrepareTagOrchestrator, _initClass]} = _apply_decs_2311(this, [_dec], []));
+		({c: [_PrepareTagSyncUseCaseImpl, _initClass]} = _apply_decs_2311(this, [_dec], []));
 	}
-	constructor(fs, logger, tryLoadCodefastConfig) {
+	constructor(fs, repoRootResolver, loadCodefastConfig) {
 		this.fs = fs;
-		this.logger = logger;
-		this.tryLoadCodefastConfig = tryLoadCodefastConfig;
+		this.repoRootResolver = repoRootResolver;
+		this.loadCodefastConfig = loadCodefastConfig;
 	}
 	async execute(args) {
-		const globalsOutcome = parseGlobalCliOptions(args.globalCliRaw);
-		if (!globalsOutcome.ok) return globalsOutcome;
 		const rootDir = resolveTagWorkspaceRootPath({
-			resolveStrictRepoRoot: () => findRepoRoot(this.fs, args.currentWorkingDirectory),
-			logger: this.logger,
+			repoRootResolver: this.repoRootResolver,
 			currentWorkingDirectory: args.currentWorkingDirectory
 		});
-		const loadedOutcome = await this.tryLoadCodefastConfig.execute(rootDir);
+		const loadedOutcome = await this.loadCodefastConfig.execute(rootDir);
 		if (!loadedOutcome.ok) return loadedOutcome;
 		const resolvedTargetPath = resolveTagCliTargetPath({
 			fs: this.fs,
@@ -261,4 +261,4 @@ let _PrepareTagOrchestrator;
 	}
 });
 //#endregion
-export { _PrepareTagOrchestrator as PrepareTagOrchestrator };
+export { _PrepareTagSyncUseCaseImpl as PrepareTagSyncUseCaseImpl };

package/dist/lib/tag/application/use-cases/run-tag-sync.use-case.mjs

@@ -1,9 +1,10 @@
-import { CliFsToken, CliPathToken } from "../../../core/operational/contracts/tokens.mjs";
-import { appError } from "../../../core/domain/errors.domain.mjs";
+import { CliFsToken, CliPathToken } from "../../../core/contracts/tokens.mjs";
+import { AppError } from "../../../core/domain/errors.domain.mjs";
 import { err, ok } from "../../../core/domain/result.model.mjs";
-import { messageFromCaughtUnknown } from "../../../core/application/utils/caught-unknown-message.util.mjs";
+import { messageFromCaughtUnknown } from "../../../core/domain/caught-unknown-message.value-object.mjs";
 import { TagSinceWriterPortToken, TagTargetResolverPortToken, TagVersionResolverPortToken, TypeScriptTreeWalkPortToken } from "../../contracts/tokens.mjs";
-import { injectable } from "@codefast/di";
+import { runTagOnTarget } from "../services/tag-target-runner.service.mjs";
+import { inject, injectable } from "@codefast/di";
 //#region src/lib/tag/application/use-cases/run-tag-sync.use-case.ts
 function toPrimitive(input, hint) {
 	if (typeof input !== "object" || input === null) return input;
@@ -215,24 +216,6 @@ function _apply_decs_2311(targetClass, classDecs, memberDecs, classDecsHaveThis,
 	};
 }
 let _dec, _initClass;
-function resolveNearestPackageVersion(targetPath, fs, versionResolver) {
-	return versionResolver.resolveNearestPackageVersion(targetPath, fs);
-}
-function runTagOnTarget(targetPath, opts, fs, pathService, versionResolver, sinceWriter, typeScriptTreeWalk) {
-	const resolvedTarget = pathService.resolve(targetPath);
-	const version = resolveNearestPackageVersion(resolvedTarget, fs, versionResolver);
-	const tsFiles = (fs.statSync(resolvedTarget).isDirectory() ? typeScriptTreeWalk.walkTsxFiles(resolvedTarget, fs) : [resolvedTarget]).filter((filePath) => filePath.endsWith(".ts") || filePath.endsWith(".tsx"));
-	const fileResults = tsFiles.map((filePath) => sinceWriter.applySinceTagsToFile(filePath, version, fs, opts.write));
-	const filesChanged = fileResults.filter((result) => result.changed).length;
-	const taggedDeclarations = fileResults.reduce((sum, result) => sum + result.taggedDeclarations, 0);
-	return {
-		version,
-		filesScanned: tsFiles.length,
-		filesChanged,
-		taggedDeclarations,
-		fileResults
-	};
-}
 async function runTagOnAfterWriteHook(hook, modifiedFiles) {
 	if (!hook || modifiedFiles.length === 0) return null;
 	try {
@@ -333,12 +316,12 @@ async function runOnResolvedTarget(resolvedTarget, write, fs, pathService, versi
 	}
 }
 _dec = injectable([
-	CliFsToken,
-	CliPathToken,
-	TagTargetResolverPortToken,
-	TypeScriptTreeWalkPortToken,
-	TagVersionResolverPortToken,
-	TagSinceWriterPortToken
+	inject(CliFsToken),
+	inject(CliPathToken),
+	inject(TagTargetResolverPortToken),
+	inject(TypeScriptTreeWalkPortToken),
+	inject(TagVersionResolverPortToken),
+	inject(TagSinceWriterPortToken)
 ]);
 let _RunTagSyncUseCaseImpl;
 (class {
@@ -362,7 +345,7 @@ let _RunTagSyncUseCaseImpl;
 	async execute(input) {
 		try {
 			const tagConfig = input.config;
-			const { includedCandidates, skippedPackages } = filterSkippedCandidates(await this.targetResolver.resolveTagTargetCandidates(input.rootDir, input.targetPath, this.fs), input.skipPackages);
+			const { includedCandidates, skippedPackages } = filterSkippedCandidates(await this.targetResolver.resolveTagTargetCandidates(input.rootDir, input.targetPath), input.skipPackages);
 			const selectedTargets = includedCandidates.map((candidate) => resolveTargetSelection(candidate, input.rootDir, this.path, this.fs));
 			const targetExecutionResults = await Promise.all(selectedTargets.map((resolvedTarget) => runOnResolvedTarget(resolvedTarget, input.write, this.fs, this.path, this.versionResolver, this.sinceWriter, this.typeScriptTreeWalk, input.listener)));
 			const allFileResults = targetExecutionResults.flatMap((targetResult) => targetResult.result?.fileResults ?? []);
@@ -387,7 +370,7 @@ let _RunTagSyncUseCaseImpl;
 				hookError
 			});
 		} catch (caughtError) {
-			return err(appError("INFRA_FAILURE", messageFromCaughtUnknown(caughtError), caughtError));
+			return err(new AppError("INFRA_FAILURE", messageFromCaughtUnknown(caughtError), caughtError));
 		}
 	}
 	static {
@@ -395,4 +378,4 @@ let _RunTagSyncUseCaseImpl;
 	}
 });
 //#endregion
-export { _RunTagSyncUseCaseImpl as RunTagSyncUseCaseImpl, resolveNearestPackageVersion, runTagOnTarget };
+export { _RunTagSyncUseCaseImpl as RunTagSyncUseCaseImpl };