@decohere/forge 0.0.1-dev.11 → 0.0.1-dev.110
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +139 -0
- package/commonjs/src/actions/build.action.js +8 -2
- package/commonjs/src/actions/clean.action.js +2 -4
- package/commonjs/src/actions/commit.action.js +0 -2
- package/commonjs/src/actions/copy.action.js +37 -7
- package/commonjs/src/actions/dependency-report.action.js +0 -2
- package/commonjs/src/actions/dependency-sync.action.js +0 -2
- package/commonjs/src/actions/docker.action.js +209 -0
- package/commonjs/src/actions/index.js +5 -2
- package/commonjs/src/actions/link.action.js +154 -0
- package/commonjs/src/actions/package.action.js +234 -0
- package/commonjs/src/actions/publish.action.js +0 -2
- package/commonjs/src/actions/sync-lock-file.action.js +0 -2
- package/commonjs/src/actions/tag.action.js +2 -5
- package/commonjs/src/actions/typecheck.action.js +67 -0
- package/commonjs/src/actions/unlink.action.js +74 -0
- package/commonjs/src/actions/version.action.js +1 -5
- package/commonjs/src/actions/watch.action.js +0 -2
- package/commonjs/src/commands/build.command.js +0 -2
- package/commonjs/src/commands/dependency.command.js +0 -2
- package/commonjs/src/commands/docker.command.js +26 -0
- package/commonjs/src/commands/forge.command.js +0 -2
- package/commonjs/src/commands/index.js +4 -2
- package/commonjs/src/commands/link.command.js +87 -0
- package/commonjs/src/commands/package.command.js +36 -0
- package/commonjs/src/commands/publish.command.js +0 -2
- package/commonjs/src/commands/tag.command.js +0 -2
- package/commonjs/src/commands/typecheck.command.js +24 -0
- package/commonjs/src/commands/version.command.js +0 -2
- package/commonjs/src/const.js +0 -2
- package/commonjs/src/create-workspace.js +42 -0
- package/commonjs/src/errors.js +0 -2
- package/commonjs/src/extensions/project.extensions.js +0 -2
- package/commonjs/src/factories/swc-config.factory.js +17 -6
- package/commonjs/src/forge.module.js +20 -21
- package/commonjs/src/index.js +7 -2
- package/commonjs/src/mixins/caches-outputs.mixin.js +7 -7
- package/commonjs/src/mixins/incremental-transform.mixin.js +0 -2
- package/commonjs/src/packaging/dependency-pinner.service.js +118 -0
- package/commonjs/src/packaging/deployable.js +44 -0
- package/commonjs/src/packaging/import-graph.service.js +137 -0
- package/commonjs/src/packaging/release-exports.js +88 -0
- package/commonjs/src/packaging/ui-assets.js +75 -0
- package/commonjs/src/services/dependency-resolver.service.js +0 -2
- package/commonjs/src/services/file-writer.service.js +0 -2
- package/commonjs/src/services/swc-transpiler.js +36 -10
- package/commonjs/src/services/ts-program-host.js +2 -4
- package/commonjs/src/services/type-emission-program.js +23 -8
- package/commonjs/src/services/type-emitter.js +33 -5
- package/commonjs/src/types/build-target.type.js +0 -2
- package/commonjs/src/types/configuration.type.js +0 -2
- package/commonjs/src/types/dependency.types.js +0 -2
- package/commonjs/src/types/swc-config.type.js +0 -2
- package/commonjs/src/types/transform-response.model.js +1 -2
- package/commonjs/src/types/transformer.type.js +0 -2
- package/commonjs/src/types/workspace-config.type.js +0 -2
- package/commonjs/src/vitest/forge-build.plugin.js +2 -3
- package/commonjs/src/vitest/index.js +0 -2
- package/commonjs/src/workspace.config.js +37 -4
- package/es6/src/actions/build.action.js +8 -4
- package/es6/src/actions/clean.action.js +2 -5
- package/es6/src/actions/commit.action.js +0 -3
- package/es6/src/actions/copy.action.js +37 -8
- package/es6/src/actions/dependency-report.action.js +0 -4
- package/es6/src/actions/dependency-sync.action.js +0 -4
- package/es6/src/actions/docker.action.js +194 -0
- package/es6/src/actions/index.js +5 -2
- package/es6/src/actions/link.action.js +128 -0
- package/es6/src/actions/package.action.js +219 -0
- package/es6/src/actions/publish.action.js +0 -3
- package/es6/src/actions/sync-lock-file.action.js +0 -2
- package/es6/src/actions/tag.action.js +2 -6
- package/es6/src/actions/typecheck.action.js +52 -0
- package/es6/src/actions/unlink.action.js +59 -0
- package/es6/src/actions/version.action.js +1 -6
- package/es6/src/actions/watch.action.js +0 -3
- package/es6/src/commands/build.command.js +0 -2
- package/es6/src/commands/dependency.command.js +0 -2
- package/es6/src/commands/docker.command.js +16 -0
- package/es6/src/commands/forge.command.js +0 -2
- package/es6/src/commands/index.js +4 -2
- package/es6/src/commands/link.command.js +64 -0
- package/es6/src/commands/package.command.js +26 -0
- package/es6/src/commands/publish.command.js +0 -2
- package/es6/src/commands/tag.command.js +0 -2
- package/es6/src/commands/typecheck.command.js +14 -0
- package/es6/src/commands/version.command.js +0 -2
- package/es6/src/const.js +0 -2
- package/es6/src/create-workspace.js +30 -0
- package/es6/src/errors.js +0 -2
- package/es6/src/extensions/project.extensions.js +0 -2
- package/es6/src/factories/swc-config.factory.js +17 -6
- package/es6/src/forge.module.js +20 -21
- package/es6/src/index.js +2 -3
- package/es6/src/mixins/caches-outputs.mixin.js +7 -7
- package/es6/src/mixins/incremental-transform.mixin.js +0 -2
- package/es6/src/packaging/dependency-pinner.service.js +103 -0
- package/es6/src/packaging/deployable.js +21 -0
- package/es6/src/packaging/import-graph.service.js +122 -0
- package/es6/src/packaging/release-exports.js +78 -0
- package/es6/src/packaging/ui-assets.js +49 -0
- package/es6/src/services/dependency-resolver.service.js +0 -2
- package/es6/src/services/file-writer.service.js +0 -2
- package/es6/src/services/swc-transpiler.js +36 -10
- package/es6/src/services/ts-program-host.js +2 -4
- package/es6/src/services/type-emission-program.js +23 -8
- package/es6/src/services/type-emitter.js +30 -5
- package/es6/src/types/build-target.type.js +0 -2
- package/es6/src/types/configuration.type.js +0 -2
- package/es6/src/types/dependency.types.js +0 -2
- package/es6/src/types/swc-config.type.js +0 -2
- package/es6/src/types/transform-response.model.js +1 -2
- package/es6/src/types/transformer.type.js +0 -2
- package/es6/src/types/workspace-config.type.js +0 -2
- package/es6/src/vitest/forge-build.plugin.js +2 -3
- package/es6/src/vitest/index.js +0 -2
- package/es6/src/workspace.config.js +38 -4
- package/package.json +5 -5
- package/types/src/actions/build.action.d.ts +1 -0
- package/types/src/actions/copy.action.d.ts +10 -0
- package/types/src/actions/docker.action.d.ts +38 -0
- package/types/src/actions/index.d.ts +5 -0
- package/types/src/actions/link.action.d.ts +25 -0
- package/types/src/actions/package.action.d.ts +38 -0
- package/types/src/actions/typecheck.action.d.ts +14 -0
- package/types/src/actions/unlink.action.d.ts +9 -0
- package/types/src/commands/docker.command.d.ts +6 -0
- package/types/src/commands/index.d.ts +4 -0
- package/types/src/commands/link.command.d.ts +28 -0
- package/types/src/commands/package.command.d.ts +11 -0
- package/types/src/commands/typecheck.command.d.ts +6 -0
- package/types/src/create-workspace.d.ts +7 -0
- package/types/src/factories/swc-config.factory.d.ts +1 -0
- package/types/src/forge.module.d.ts +10 -0
- package/types/src/index.d.ts +2 -1
- package/types/src/packaging/dependency-pinner.service.d.ts +20 -0
- package/types/src/packaging/deployable.d.ts +17 -0
- package/types/src/packaging/import-graph.service.d.ts +33 -0
- package/types/src/packaging/release-exports.d.ts +18 -0
- package/types/src/packaging/ui-assets.d.ts +21 -0
- package/types/src/services/swc-transpiler.d.ts +15 -3
- package/types/src/services/ts-program-host.d.ts +1 -1
- package/types/src/services/type-emission-program.d.ts +6 -1
- package/types/src/services/type-emitter.d.ts +14 -0
- package/types/src/types/configuration.type.d.ts +5 -0
- package/types/src/types/swc-config.type.d.ts +7 -1
- package/types/src/types/transform-response.model.d.ts +2 -0
- package/types/src/workspace.config.d.ts +6 -0
|
@@ -0,0 +1,154 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
function _export(target, all) {
|
|
6
|
+
for(var name in all)Object.defineProperty(target, name, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: Object.getOwnPropertyDescriptor(all, name).get
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
_export(exports, {
|
|
12
|
+
get DEFAULT_LINK_CONFIGURATION () {
|
|
13
|
+
return DEFAULT_LINK_CONFIGURATION;
|
|
14
|
+
},
|
|
15
|
+
get LINK_MANIFEST () {
|
|
16
|
+
return LINK_MANIFEST;
|
|
17
|
+
},
|
|
18
|
+
get Link () {
|
|
19
|
+
return Link;
|
|
20
|
+
}
|
|
21
|
+
});
|
|
22
|
+
const _promises = /*#__PURE__*/ _interop_require_default(require("node:fs/promises"));
|
|
23
|
+
const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
|
|
24
|
+
const _decorators = require("@decohere/crucible/decorators");
|
|
25
|
+
const _mesh = require("@decohere/mesh");
|
|
26
|
+
const _cli = require("@decohere/nexus/cli");
|
|
27
|
+
const _scribe = require("@decohere/scribe");
|
|
28
|
+
require("../extensions/project.extensions.js");
|
|
29
|
+
const _errors = require("../errors.js");
|
|
30
|
+
function _interop_require_default(obj) {
|
|
31
|
+
return obj && obj.__esModule ? obj : {
|
|
32
|
+
default: obj
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
36
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
37
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
38
|
+
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
39
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
40
|
+
}
|
|
41
|
+
function _ts_metadata(k, v) {
|
|
42
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
43
|
+
}
|
|
44
|
+
const LINK_MANIFEST = ".forge-link.json";
|
|
45
|
+
const DEFAULT_LINK_CONFIGURATION = "link";
|
|
46
|
+
class Link {
|
|
47
|
+
workspace;
|
|
48
|
+
#logger = _scribe.scribe.logger(Link.name);
|
|
49
|
+
constructor(workspace){
|
|
50
|
+
this.workspace = workspace;
|
|
51
|
+
}
|
|
52
|
+
run = async (options)=>{
|
|
53
|
+
const targetDir = _nodepath.default.resolve(options.targetDir);
|
|
54
|
+
const nodeModulesDir = _nodepath.default.join(targetDir, "node_modules");
|
|
55
|
+
const stat = await _promises.default.stat(nodeModulesDir).catch(()=>null);
|
|
56
|
+
if (stat == null) {
|
|
57
|
+
throw new _errors.ForgeError(`node_modules not found in "${targetDir}". Run pnpm install first.`);
|
|
58
|
+
}
|
|
59
|
+
const projects = this.workspace.getProjects(options.configuration);
|
|
60
|
+
if (projects.length === 0) {
|
|
61
|
+
throw new _errors.ForgeError(`No projects found for configuration "${options.configuration}"`);
|
|
62
|
+
}
|
|
63
|
+
// Load any existing manifest so originalPath values are preserved on re-link
|
|
64
|
+
const manifestPath = _nodepath.default.join(targetDir, LINK_MANIFEST);
|
|
65
|
+
const existingManifestText = await _promises.default.readFile(manifestPath, "utf8").catch(()=>null);
|
|
66
|
+
const existingManifest = existingManifestText != null ? JSON.parse(existingManifestText) : null;
|
|
67
|
+
const manifest = {
|
|
68
|
+
workspaceRoot: this.workspace.rootDir,
|
|
69
|
+
links: []
|
|
70
|
+
};
|
|
71
|
+
for (const project of projects){
|
|
72
|
+
const pkg = await project.getPackageJson();
|
|
73
|
+
const packageName = pkg.name;
|
|
74
|
+
if (!packageName) {
|
|
75
|
+
this.#logger.trace(`Skipping project "${project.name}" — no package name`);
|
|
76
|
+
continue;
|
|
77
|
+
}
|
|
78
|
+
// Resolve the build output directory (no target arg — debug config is not packed)
|
|
79
|
+
const outDir = project.getOutDir();
|
|
80
|
+
const absoluteOutDir = _nodepath.default.resolve(outDir);
|
|
81
|
+
// Pre-create the output dir so the symlink is valid even before a build completes.
|
|
82
|
+
await _promises.default.mkdir(absoluteOutDir, {
|
|
83
|
+
recursive: true
|
|
84
|
+
});
|
|
85
|
+
// Compute symlink path inside target node_modules
|
|
86
|
+
const symlinkPath = _nodepath.default.join(nodeModulesDir, ...packageName.split("/"));
|
|
87
|
+
const symlinkParent = _nodepath.default.dirname(symlinkPath);
|
|
88
|
+
// Capture any existing entry so we can restore it on unlink.
|
|
89
|
+
// If a manifest already exists for this package, preserve its originalPath —
|
|
90
|
+
// the current symlink is our own and must not be treated as the original.
|
|
91
|
+
let originalPath = null;
|
|
92
|
+
const existingStat = await _promises.default.lstat(symlinkPath).catch(()=>null);
|
|
93
|
+
if (existingStat != null) {
|
|
94
|
+
const existingEntry = existingManifest?.links.find((l)=>l.packageName === packageName);
|
|
95
|
+
if (existingEntry != null) {
|
|
96
|
+
// Already linked — preserve the recorded originalPath and replace the symlink
|
|
97
|
+
originalPath = existingEntry.originalPath;
|
|
98
|
+
if (existingStat.isSymbolicLink()) {
|
|
99
|
+
await _promises.default.unlink(symlinkPath);
|
|
100
|
+
}
|
|
101
|
+
} else if (existingStat.isSymbolicLink()) {
|
|
102
|
+
originalPath = await _promises.default.readlink(symlinkPath);
|
|
103
|
+
await _promises.default.unlink(symlinkPath);
|
|
104
|
+
} else {
|
|
105
|
+
// Real directory — back it up by renaming
|
|
106
|
+
originalPath = `${symlinkPath}.__forge_backup__`;
|
|
107
|
+
await _promises.default.rename(symlinkPath, originalPath);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
await _promises.default.mkdir(symlinkParent, {
|
|
111
|
+
recursive: true
|
|
112
|
+
});
|
|
113
|
+
await _promises.default.symlink(absoluteOutDir, symlinkPath, "dir");
|
|
114
|
+
manifest.links.push({
|
|
115
|
+
packageName,
|
|
116
|
+
symlinkPath,
|
|
117
|
+
originalPath
|
|
118
|
+
});
|
|
119
|
+
this.#logger.info(`Linked ${packageName} → ${absoluteOutDir}`);
|
|
120
|
+
}
|
|
121
|
+
// Create a peer node_modules at the build output root so Node can resolve
|
|
122
|
+
// bare specifiers from the real (non-symlink) paths of linked packages.
|
|
123
|
+
if (manifest.links.length > 0) {
|
|
124
|
+
const buildRoot = _nodepath.default.resolve(projects[0].getRootOut());
|
|
125
|
+
const peerNodeModulesDir = _nodepath.default.join(buildRoot, "node_modules");
|
|
126
|
+
await _promises.default.rm(peerNodeModulesDir, {
|
|
127
|
+
recursive: true,
|
|
128
|
+
force: true
|
|
129
|
+
});
|
|
130
|
+
for (const project of projects){
|
|
131
|
+
const pkg = await project.getPackageJson();
|
|
132
|
+
if (!pkg.name) continue;
|
|
133
|
+
const outDir = _nodepath.default.resolve(project.getOutDir());
|
|
134
|
+
const peerSymlink = _nodepath.default.join(peerNodeModulesDir, ...pkg.name.split("/"));
|
|
135
|
+
await _promises.default.mkdir(_nodepath.default.dirname(peerSymlink), {
|
|
136
|
+
recursive: true
|
|
137
|
+
});
|
|
138
|
+
await _promises.default.symlink(outDir, peerSymlink, "dir");
|
|
139
|
+
this.#logger.trace(`Peer-linked ${pkg.name} → ${outDir}`);
|
|
140
|
+
}
|
|
141
|
+
manifest.peerNodeModulesDir = peerNodeModulesDir;
|
|
142
|
+
this.#logger.info(`Created peer node_modules at ${peerNodeModulesDir}`);
|
|
143
|
+
}
|
|
144
|
+
await _promises.default.writeFile(_nodepath.default.join(targetDir, LINK_MANIFEST), JSON.stringify(manifest, null, 2));
|
|
145
|
+
return _cli.ActionResponse.Success(Link.name);
|
|
146
|
+
};
|
|
147
|
+
}
|
|
148
|
+
Link = _ts_decorate([
|
|
149
|
+
(0, _decorators.injectable)(),
|
|
150
|
+
_ts_metadata("design:type", Function),
|
|
151
|
+
_ts_metadata("design:paramtypes", [
|
|
152
|
+
typeof _mesh.Workspace === "undefined" ? Object : _mesh.Workspace
|
|
153
|
+
])
|
|
154
|
+
], Link);
|
|
@@ -0,0 +1,234 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "PackageDeployable", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return PackageDeployable;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _promises = /*#__PURE__*/ _interop_require_default(require("node:fs/promises"));
|
|
12
|
+
const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
|
|
13
|
+
const _decorators = require("@decohere/crucible/decorators");
|
|
14
|
+
const _mesh = require("@decohere/mesh");
|
|
15
|
+
const _cli = require("@decohere/nexus/cli");
|
|
16
|
+
const _interop = require("@decohere/nexus/interop");
|
|
17
|
+
const _io = require("@decohere/nexus/io");
|
|
18
|
+
const _scribe = require("@decohere/scribe");
|
|
19
|
+
const _errors = require("../errors.js");
|
|
20
|
+
const _dependencypinnerservice = require("../packaging/dependency-pinner.service.js");
|
|
21
|
+
const _deployable = require("../packaging/deployable.js");
|
|
22
|
+
const _importgraphservice = require("../packaging/import-graph.service.js");
|
|
23
|
+
const _releaseexports = require("../packaging/release-exports.js");
|
|
24
|
+
const _uiassets = require("../packaging/ui-assets.js");
|
|
25
|
+
const _workspaceconfig = require("../workspace.config.js");
|
|
26
|
+
function _interop_require_default(obj) {
|
|
27
|
+
return obj && obj.__esModule ? obj : {
|
|
28
|
+
default: obj
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
32
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
33
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
34
|
+
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
35
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
36
|
+
}
|
|
37
|
+
function _ts_metadata(k, v) {
|
|
38
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
39
|
+
}
|
|
40
|
+
class PackageDeployable {
|
|
41
|
+
workspace;
|
|
42
|
+
importGraph;
|
|
43
|
+
pinner;
|
|
44
|
+
#logger = _scribe.scribe.logger(PackageDeployable.name);
|
|
45
|
+
npm = new _interop.Npm();
|
|
46
|
+
constructor(workspace, importGraph, pinner){
|
|
47
|
+
this.workspace = workspace;
|
|
48
|
+
this.importGraph = importGraph;
|
|
49
|
+
this.pinner = pinner;
|
|
50
|
+
}
|
|
51
|
+
async run(options) {
|
|
52
|
+
const projects = this.workspace.getProjects(_workspaceconfig.Release.name);
|
|
53
|
+
const selected = await this.select(projects, options.project);
|
|
54
|
+
if (typeof selected === "string") {
|
|
55
|
+
return _cli.ActionResponse.Error(PackageDeployable.name, selected);
|
|
56
|
+
}
|
|
57
|
+
if (selected.length === 0) {
|
|
58
|
+
this.#logger.info("No projects found with a Dockerfile — nothing to package");
|
|
59
|
+
return _cli.ActionResponse.Success(PackageDeployable.name, []);
|
|
60
|
+
}
|
|
61
|
+
const releaseProjects = await this.releaseProjects(projects);
|
|
62
|
+
const responses = [];
|
|
63
|
+
for (const project of selected){
|
|
64
|
+
responses.push(await this.packageProject(project, releaseProjects, projects));
|
|
65
|
+
}
|
|
66
|
+
return responses.some((response)=>!response.succeeded) ? _cli.ActionResponse.Error(PackageDeployable.name, responses) : _cli.ActionResponse.Success(PackageDeployable.name, responses);
|
|
67
|
+
}
|
|
68
|
+
/** The deployables to package, or the reason a named project cannot be one. */ async select(projects, requested) {
|
|
69
|
+
if (requested == null || requested === "") {
|
|
70
|
+
const found = [];
|
|
71
|
+
for (const project of projects){
|
|
72
|
+
if (await _deployable.deployable.isDeployable(project)) {
|
|
73
|
+
found.push(project);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
return found;
|
|
77
|
+
}
|
|
78
|
+
const project = projects.find((candidate)=>candidate.name === requested);
|
|
79
|
+
if (project == null) {
|
|
80
|
+
return `${requested} is not a workspace project. Known projects: ${projects.map((p)=>p.name).join(", ")}`;
|
|
81
|
+
}
|
|
82
|
+
if (!await _deployable.deployable.isDeployable(project)) {
|
|
83
|
+
return `${requested} has no ${_deployable.deployable.dockerfileName(project)}, so it is a library, not a deployable. ` + "Libraries are packaged into the deployables that import them.";
|
|
84
|
+
}
|
|
85
|
+
return [
|
|
86
|
+
project
|
|
87
|
+
];
|
|
88
|
+
}
|
|
89
|
+
async releaseProjects(projects) {
|
|
90
|
+
const entries = await Promise.all(projects.map(async (project)=>{
|
|
91
|
+
const pkg = await project.getPackageJson();
|
|
92
|
+
return [
|
|
93
|
+
project.name,
|
|
94
|
+
{
|
|
95
|
+
name: project.name,
|
|
96
|
+
pkg,
|
|
97
|
+
projectRoot: _nodepath.default.resolve(project.projectRoot),
|
|
98
|
+
releaseDir: _nodepath.default.resolve(project.getOutDir())
|
|
99
|
+
}
|
|
100
|
+
];
|
|
101
|
+
}));
|
|
102
|
+
return new Map(entries);
|
|
103
|
+
}
|
|
104
|
+
async packageProject(project, releaseProjects, projects) {
|
|
105
|
+
const outDir = _nodepath.default.join(_nodepath.default.resolve(project.projectRoot), _deployable.PACKAGE_DIR);
|
|
106
|
+
const base = {
|
|
107
|
+
projectName: project.name,
|
|
108
|
+
outDir,
|
|
109
|
+
workspacePackages: [],
|
|
110
|
+
dependencies: {}
|
|
111
|
+
};
|
|
112
|
+
try {
|
|
113
|
+
const entry = releaseProjects.get(project.name);
|
|
114
|
+
if (!await _io.io.directoryExists(_nodepath.default.join(entry.releaseDir, "es6"))) {
|
|
115
|
+
throw new _errors.ForgeError(`No release build for ${project.name}. Run \`forge build --configuration release\` first.`);
|
|
116
|
+
}
|
|
117
|
+
const ui = await _uiassets.uiAssets.resolve(project, projects);
|
|
118
|
+
const reached = await this.importGraph.walk(entry, releaseProjects);
|
|
119
|
+
const libraries = [
|
|
120
|
+
...reached.workspace
|
|
121
|
+
].filter((name)=>name !== project.name).sort().map((name)=>releaseProjects.get(name));
|
|
122
|
+
const dependencies = await this.pinner.pin(reached.thirdParty, [
|
|
123
|
+
entry,
|
|
124
|
+
...libraries
|
|
125
|
+
], releaseProjects, {
|
|
126
|
+
dir: _nodepath.default.resolve(this.workspace.rootDir),
|
|
127
|
+
pkg: await this.workspace.getPackageJson()
|
|
128
|
+
});
|
|
129
|
+
await this.write(entry, libraries, dependencies, outDir, ui);
|
|
130
|
+
const workspacePackages = [
|
|
131
|
+
...reached.workspace
|
|
132
|
+
].sort();
|
|
133
|
+
this.#logger.info(`Packaged ${project.name} to ${outDir}`, {
|
|
134
|
+
workspace: workspacePackages,
|
|
135
|
+
thirdParty: Object.keys(dependencies)
|
|
136
|
+
});
|
|
137
|
+
return {
|
|
138
|
+
projectName: project.name,
|
|
139
|
+
outDir,
|
|
140
|
+
workspacePackages,
|
|
141
|
+
dependencies,
|
|
142
|
+
succeeded: true,
|
|
143
|
+
message: `Packaged ${project.name} to ${outDir}`
|
|
144
|
+
};
|
|
145
|
+
} catch (reason) {
|
|
146
|
+
const message = (0, _errors.formatUnknownError)(reason);
|
|
147
|
+
return {
|
|
148
|
+
...base,
|
|
149
|
+
succeeded: false,
|
|
150
|
+
message,
|
|
151
|
+
error: `${project.name}: ${message}`
|
|
152
|
+
};
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
async write(entry, libraries, dependencies, outDir, ui) {
|
|
156
|
+
await _promises.default.rm(outDir, {
|
|
157
|
+
recursive: true,
|
|
158
|
+
force: true
|
|
159
|
+
});
|
|
160
|
+
await _promises.default.mkdir(outDir, {
|
|
161
|
+
recursive: true
|
|
162
|
+
});
|
|
163
|
+
await this.writeJson(_nodepath.default.join(outDir, "package.json"), {
|
|
164
|
+
name: entry.name.replace(/^@/, "").replace("/", "-"),
|
|
165
|
+
version: entry.pkg.version,
|
|
166
|
+
private: true,
|
|
167
|
+
type: "module",
|
|
168
|
+
scripts: {
|
|
169
|
+
start: `node es6/${_releaseexports.releaseExports.toJs(entry.pkg.main ?? "src/index.ts")}`
|
|
170
|
+
},
|
|
171
|
+
dependencies
|
|
172
|
+
});
|
|
173
|
+
// npm writes real folders. It also removes anything in node_modules it does not know,
|
|
174
|
+
// so the workspace libraries are copied in only after it has run.
|
|
175
|
+
if (Object.keys(dependencies).length > 0) {
|
|
176
|
+
await this.npm.installProduction({
|
|
177
|
+
cwd: outDir
|
|
178
|
+
});
|
|
179
|
+
}
|
|
180
|
+
await this.copyTree(_nodepath.default.join(entry.releaseDir, "es6"), _nodepath.default.join(outDir, "es6"));
|
|
181
|
+
const config = _nodepath.default.join(_nodepath.default.resolve(this.workspace.rootDir), "config");
|
|
182
|
+
if (await _io.io.directoryExists(config)) {
|
|
183
|
+
await this.copyTree(config, _nodepath.default.join(outDir, "config"));
|
|
184
|
+
}
|
|
185
|
+
if (ui != null) {
|
|
186
|
+
await this.copyTree(ui.from, _nodepath.default.join(outDir, ui.to));
|
|
187
|
+
}
|
|
188
|
+
for (const library of libraries){
|
|
189
|
+
const target = _nodepath.default.join(outDir, "node_modules", ...library.name.split("/"));
|
|
190
|
+
await this.copyTree(_nodepath.default.join(library.releaseDir, "es6"), _nodepath.default.join(target, "es6"));
|
|
191
|
+
await this.writeJson(_nodepath.default.join(target, "package.json"), {
|
|
192
|
+
name: library.name,
|
|
193
|
+
version: library.pkg.version,
|
|
194
|
+
type: "module",
|
|
195
|
+
exports: _releaseexports.releaseExports.build(library.pkg)
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
await this.assertNoSymlinks(outDir);
|
|
199
|
+
}
|
|
200
|
+
/** Copies file contents, never links: a symlink in the output would break outside the image. */ async copyTree(from, to) {
|
|
201
|
+
await _promises.default.cp(from, to, {
|
|
202
|
+
recursive: true,
|
|
203
|
+
dereference: true
|
|
204
|
+
});
|
|
205
|
+
}
|
|
206
|
+
async writeJson(filePath, value) {
|
|
207
|
+
await _io.io.writeFile(filePath, `${JSON.stringify(value, null, "\t")}\n`, {
|
|
208
|
+
mkdir: true,
|
|
209
|
+
encoding: "utf8"
|
|
210
|
+
});
|
|
211
|
+
}
|
|
212
|
+
async assertNoSymlinks(dir) {
|
|
213
|
+
for (const entry of (await _promises.default.readdir(dir, {
|
|
214
|
+
withFileTypes: true
|
|
215
|
+
}))){
|
|
216
|
+
const entryPath = _nodepath.default.join(dir, entry.name);
|
|
217
|
+
if (entry.isSymbolicLink()) {
|
|
218
|
+
throw new _errors.ForgeError(`The packaged output must hold no symlinks, but found ${entryPath}`);
|
|
219
|
+
}
|
|
220
|
+
if (entry.isDirectory()) {
|
|
221
|
+
await this.assertNoSymlinks(entryPath);
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
PackageDeployable = _ts_decorate([
|
|
227
|
+
(0, _decorators.injectable)(),
|
|
228
|
+
_ts_metadata("design:type", Function),
|
|
229
|
+
_ts_metadata("design:paramtypes", [
|
|
230
|
+
typeof _mesh.Workspace === "undefined" ? Object : _mesh.Workspace,
|
|
231
|
+
typeof _importgraphservice.ImportGraph === "undefined" ? Object : _importgraphservice.ImportGraph,
|
|
232
|
+
typeof _dependencypinnerservice.DependencyPinner === "undefined" ? Object : _dependencypinnerservice.DependencyPinner
|
|
233
|
+
])
|
|
234
|
+
], PackageDeployable);
|
|
@@ -152,5 +152,3 @@ Publish = _ts_decorate([
|
|
|
152
152
|
typeof _mesh.Workspace === "undefined" ? Object : _mesh.Workspace
|
|
153
153
|
])
|
|
154
154
|
], Publish);
|
|
155
|
-
|
|
156
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["/home/runner/work/decohere/decohere/projects/forge/src/actions/publish.action.ts"],"sourcesContent":["import { injectable } from \"@decohere/crucible/decorators\";\nimport type { Project } from \"@decohere/mesh\";\n// biome-ignore lint/style/useImportType: <DI>\nimport { Workspace } from \"@decohere/mesh\";\nimport type { Action, ResultStatus } from \"@decohere/nexus/cli\";\nimport { ActionResponse } from \"@decohere/nexus/cli\";\nimport { Npm } from \"@decohere/nexus/interop\";\nimport { scribe } from \"@decohere/scribe\";\nimport { ForgeError, formatUnknownError } from \"../errors.js\";\n\nexport type PublishOptions = {\n\tconfiguration: string;\n\tchannel?: string;\n\tdryRun?: boolean;\n\ttoken?: string;\n\totp?: string;\n\tpromptAuth?: boolean;\n\tpromptOtp?: boolean;\n};\n\nexport type PublishResponse = ResultStatus & {\n\tprojectName: string;\n\tmessage: string;\n\tpackageName?: string;\n};\n\n@injectable()\nexport class Publish implements Action<PublishOptions> {\n\t// TODO: probably best to inject npm\n\tprivate readonly npm = new Npm();\n\t#logger = scribe.logger(Publish.name);\n\n\tpublic constructor(private readonly workspace: Workspace) {}\n\n\tpublic async run(options: PublishOptions): Promise<ActionResponse<PublishResponse>> {\n\t\tconst projects = this.workspace.getProjects(options.configuration);\n\t\tconst token = await this.resolveToken(options);\n\t\tconst otp = await this.resolveOtp(options);\n\n\t\tif (projects.length === 0) {\n\t\t\tthrow new ForgeError(`No projects found to publish`);\n\t\t}\n\t\tconst publishResponses = await this.publishProjects(projects, {\n\t\t\t...options,\n\t\t\ttoken,\n\t\t\totp,\n\t\t});\n\t\tconst failed = publishResponses.filter((r) => !r.succeeded);\n\t\tif (failed.length) {\n\t\t\treturn ActionResponse.Error(Publish.name, publishResponses);\n\t\t}\n\t\treturn ActionResponse.Success(Publish.name, publishResponses);\n\t}\n\n\tpublic async publishProjects(projects: readonly Project[], options: PublishOptions) {\n\t\treturn await Promise.all(\n\t\t\tprojects\n\t\t\t\t.filter((project) => {\n\t\t\t\t\tif (project.isPrivate) {\n\t\t\t\t\t\tthis.#logger.info(`Skipping private package: ${project.name}`);\n\t\t\t\t\t\treturn false;\n\t\t\t\t\t}\n\t\t\t\t\treturn true;\n\t\t\t\t})\n\t\t\t\t.map(async (project) => await this.publishProject(project, options)),\n\t\t);\n\t}\n\n\tprivate async publishProject(\n\t\tproject: Project,\n\t\toptions: PublishOptions,\n\t): Promise<PublishResponse> {\n\t\tconst { channel, dryRun, token, otp } = options;\n\t\tconst outDir = project.getOutDir();\n\t\tthis.#logger.info(`${dryRun ? \"[dry-run] \" : \"\"}Publishing ${project.name}`);\n\n\t\ttry {\n\t\t\tconst response = await this.npm.publish(outDir, {\n\t\t\t\tchannel,\n\t\t\t\tdryRun,\n\t\t\t\tauthToken: token,\n\t\t\t\totp,\n\t\t\t\tskipIfPublished: true,\n\t\t\t});\n\n\t\t\tconst packageName = response.data?.join(\"\");\n\t\t\tthis.#logger.trace(`${project.name} → ${packageName ?? response.message}`);\n\t\t\treturn {\n\t\t\t\tprojectName: project.name,\n\t\t\t\tsucceeded: true,\n\t\t\t\tmessage: response.message,\n\t\t\t\tpackageName,\n\t\t\t};\n\t\t} catch (reason) {\n\t\t\tconst message = formatUnknownError(reason);\n\t\t\treturn {\n\t\t\t\tprojectName: project.name,\n\t\t\t\tsucceeded: false,\n\t\t\t\tmessage,\n\t\t\t\terror: `${project.name}: ${message}`,\n\t\t\t};\n\t\t}\n\t}\n\n\tprivate async resolveToken(options: PublishOptions): Promise<string | undefined> {\n\t\tif (options.token?.trim()) {\n\t\t\treturn options.token.trim();\n\t\t}\n\n\t\tif (options.promptAuth) {\n\t\t\treturn await this.promptSecret(\"npm access token: \");\n\t\t}\n\n\t\treturn undefined;\n\t}\n\n\tprivate async resolveOtp(options: PublishOptions): Promise<string | undefined> {\n\t\tif (options.otp?.trim()) {\n\t\t\treturn options.otp.trim();\n\t\t}\n\n\t\tif (options.promptAuth || options.promptOtp) {\n\t\t\treturn await this.promptSecret(\"npm OTP: \");\n\t\t}\n\n\t\treturn undefined;\n\t}\n\n\tprivate async promptSecret(label: string): Promise<string | undefined> {\n\t\tif (!process.stdin.isTTY || !process.stdout.isTTY) {\n\t\t\tthrow new ForgeError(`Cannot prompt for secret without an interactive TTY`);\n\t\t}\n\n\t\tprocess.stdout.write(label);\n\t\tconst stdin = process.stdin;\n\t\tstdin.setEncoding(\"utf8\");\n\t\tstdin.resume();\n\t\tstdin.setRawMode?.(true);\n\n\t\tlet value = \"\";\n\n\t\treturn await new Promise<string>((resolve, reject) => {\n\t\t\tconst cleanup = () => {\n\t\t\t\tstdin.setRawMode?.(false);\n\t\t\t\tstdin.pause();\n\t\t\t\tstdin.removeListener(\"data\", onData);\n\t\t\t\tprocess.stdout.write(\"\\n\");\n\t\t\t};\n\n\t\t\tconst onData = (chunk: string) => {\n\t\t\t\tconst char = chunk;\n\t\t\t\tif (char === \"\\u0003\") {\n\t\t\t\t\tcleanup();\n\t\t\t\t\treject(new ForgeError(\"Input cancelled\"));\n\t\t\t\t\treturn;\n\t\t\t\t}\n\n\t\t\t\tif (char === \"\\r\" || char === \"\\n\") {\n\t\t\t\t\tcleanup();\n\t\t\t\t\tresolve(value.trim());\n\t\t\t\t\treturn;\n\t\t\t\t}\n\n\t\t\t\tif (char === \"\\u0008\" || char === \"\\u007f\") {\n\t\t\t\t\tvalue = value.slice(0, -1);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\n\t\t\t\tvalue += char;\n\t\t\t};\n\n\t\t\tstdin.on(\"data\", onData);\n\t\t});\n\t}\n}\n"],"names":["Publish","npm","Npm","scribe","logger","name","workspace","run","options","projects","getProjects","configuration","token","resolveToken","otp","resolveOtp","length","ForgeError","publishResponses","publishProjects","failed","filter","r","succeeded","ActionResponse","Error","Success","Promise","all","project","isPrivate","info","map","publishProject","channel","dryRun","outDir","getOutDir","response","publish","authToken","skipIfPublished","packageName","data","join","trace","message","projectName","reason","formatUnknownError","error","trim","promptAuth","promptSecret","undefined","promptOtp","label","process","stdin","isTTY","stdout","write","setEncoding","resume","setRawMode","value","resolve","reject","cleanup","pause","removeListener","onData","chunk","char","slice","on"],"mappings":"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"}
|
|
@@ -39,5 +39,3 @@ class SyncLockFile {
|
|
|
39
39
|
SyncLockFile = _ts_decorate([
|
|
40
40
|
(0, _decorators.injectable)()
|
|
41
41
|
], SyncLockFile);
|
|
42
|
-
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9ob21lL3J1bm5lci93b3JrL2RlY29oZXJlL2RlY29oZXJlL3Byb2plY3RzL2ZvcmdlL3NyYy9hY3Rpb25zL3N5bmMtbG9jay1maWxlLmFjdGlvbi50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBpbmplY3RhYmxlIH0gZnJvbSBcIkBkZWNvaGVyZS9jcnVjaWJsZS9kZWNvcmF0b3JzXCI7XG5pbXBvcnQgdHlwZSB7IEFjdGlvbiB9IGZyb20gXCJAZGVjb2hlcmUvbmV4dXMvY2xpXCI7XG5pbXBvcnQgeyBBY3Rpb25SZXNwb25zZSB9IGZyb20gXCJAZGVjb2hlcmUvbmV4dXMvY2xpXCI7XG5pbXBvcnQgeyBQbnBtIH0gZnJvbSBcIkBkZWNvaGVyZS9uZXh1cy9pbnRlcm9wXCI7XG5pbXBvcnQgeyBzY3JpYmUgfSBmcm9tIFwiQGRlY29oZXJlL3NjcmliZVwiO1xuaW1wb3J0IHsgZm9ybWF0VW5rbm93bkVycm9yIH0gZnJvbSBcIi4uL2Vycm9ycy5qc1wiO1xuXG5leHBvcnQgdHlwZSBTeW5jTG9ja0ZpbGVPcHRpb25zID0ge1xuXHRzeW5jPzogYm9vbGVhbjtcblx0ZHJ5UnVuPzogYm9vbGVhbjtcbn07XG5cbkBpbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBTeW5jTG9ja0ZpbGUgaW1wbGVtZW50cyBBY3Rpb248U3luY0xvY2tGaWxlT3B0aW9ucz4ge1xuXHQjbG9nZ2VyID0gc2NyaWJlLmxvZ2dlcihTeW5jTG9ja0ZpbGUubmFtZSk7XG5cdCNwbnBtID0gbmV3IFBucG0oKTtcblxuXHRwdWJsaWMgYXN5bmMgcnVuKG9wdGlvbnM6IFN5bmNMb2NrRmlsZU9wdGlvbnMpOiBQcm9taXNlPEFjdGlvblJlc3BvbnNlPiB7XG5cdFx0Y29uc3Qgc2hvdWxkU3luYyA9IG9wdGlvbnMuc3luYyA/PyB0cnVlO1xuXG5cdFx0aWYgKG9wdGlvbnMuZHJ5UnVuIHx8ICFzaG91bGRTeW5jKSB7XG5cdFx0XHR0aGlzLiNsb2dnZXIuaW5mbyhcblx0XHRcdFx0b3B0aW9ucy5kcnlSdW4gPyBcIltkcnktcnVuXSBTa2lwcGluZyBsb2NrZmlsZSBzeW5jXCIgOiBcIlNraXBwaW5nIGxvY2tmaWxlIHN5bmNcIixcblx0XHRcdCk7XG5cdFx0XHRyZXR1cm4gQWN0aW9uUmVzcG9uc2UuU2tpcHBlZChTeW5jTG9ja0ZpbGUubmFtZSk7XG5cdFx0fVxuXG5cdFx0dHJ5IHtcblx0XHRcdGF3YWl0IHRoaXMuI3BucG0uc3luY0xvY2tGaWxlKCk7XG5cdFx0fSBjYXRjaCAocmVhc29uKSB7XG5cdFx0XHRyZXR1cm4gQWN0aW9uUmVzcG9uc2UuRXJyb3IoXG5cdFx0XHRcdFN5bmNMb2NrRmlsZS5uYW1lLFxuXHRcdFx0XHRgRmFpbGVkIHN5bmNpbmcgbG9ja2ZpbGU6ICR7Zm9ybWF0VW5rbm93bkVycm9yKHJlYXNvbil9YCxcblx0XHRcdCk7XG5cdFx0fVxuXG5cdFx0cmV0dXJuIEFjdGlvblJlc3BvbnNlLlN1Y2Nlc3MoU3luY0xvY2tGaWxlLm5hbWUpO1xuXHR9XG59XG4iXSwibmFtZXMiOlsiU3luY0xvY2tGaWxlIiwic2NyaWJlIiwibG9nZ2VyIiwibmFtZSIsIlBucG0iLCJydW4iLCJvcHRpb25zIiwic2hvdWxkU3luYyIsInN5bmMiLCJkcnlSdW4iLCJpbmZvIiwiQWN0aW9uUmVzcG9uc2UiLCJTa2lwcGVkIiwic3luY0xvY2tGaWxlIiwicmVhc29uIiwiRXJyb3IiLCJmb3JtYXRVbmtub3duRXJyb3IiLCJTdWNjZXNzIl0sIm1hcHBpbmdzIjoiOzs7OytCQWFhQTs7O2VBQUFBOzs7NEJBYmM7cUJBRUk7eUJBQ1Y7d0JBQ0U7d0JBQ1k7Ozs7Ozs7QUFRNUIsTUFBTUE7SUFDWixDQUFBLE1BQU8sR0FBR0MsY0FBTSxDQUFDQyxNQUFNLENBQUNGLGFBQWFHLElBQUksRUFBRTtJQUMzQyxDQUFBLElBQUssR0FBRyxJQUFJQyxhQUFJLEdBQUc7SUFFbkIsTUFBYUMsSUFBSUMsT0FBNEIsRUFBMkI7UUFDdkUsTUFBTUMsYUFBYUQsUUFBUUUsSUFBSSxJQUFJO1FBRW5DLElBQUlGLFFBQVFHLE1BQU0sSUFBSSxDQUFDRixZQUFZO1lBQ2xDLElBQUksQ0FBQyxDQUFBLE1BQU8sQ0FBQ0csSUFBSSxDQUNoQkosUUFBUUcsTUFBTSxHQUFHLHFDQUFxQztZQUV2RCxPQUFPRSxtQkFBYyxDQUFDQyxPQUFPLENBQUNaLGFBQWFHLElBQUk7UUFDaEQ7UUFFQSxJQUFJO1lBQ0gsTUFBTSxJQUFJLENBQUMsQ0FBQSxJQUFLLENBQUNVLFlBQVk7UUFDOUIsRUFBRSxPQUFPQyxRQUFRO1lBQ2hCLE9BQU9ILG1CQUFjLENBQUNJLEtBQUssQ0FDMUJmLGFBQWFHLElBQUksRUFDakIsQ0FBQyx5QkFBeUIsRUFBRWEsSUFBQUEsMEJBQWtCLEVBQUNGLFNBQVM7UUFFMUQ7UUFFQSxPQUFPSCxtQkFBYyxDQUFDTSxPQUFPLENBQUNqQixhQUFhRyxJQUFJO0lBQ2hEO0FBQ0QifQ==
|
|
@@ -47,9 +47,8 @@ class Tag {
|
|
|
47
47
|
const git = new _interop.Git();
|
|
48
48
|
await git.tag(tag);
|
|
49
49
|
if (options.push) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
await git.push(branch);
|
|
50
|
+
// Tag-only: Publish checks out a commit SHA (detached HEAD). Pushing a
|
|
51
|
+
// branch name is wrong there and unnecessary — the version label is the tag.
|
|
53
52
|
this.#logger.info(`Pushing tag: ${tag}`);
|
|
54
53
|
await git.pushTag(tag);
|
|
55
54
|
}
|
|
@@ -72,5 +71,3 @@ Tag = _ts_decorate([
|
|
|
72
71
|
typeof _mesh.Workspace === "undefined" ? Object : _mesh.Workspace
|
|
73
72
|
])
|
|
74
73
|
], Tag);
|
|
75
|
-
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9ob21lL3J1bm5lci93b3JrL2RlY29oZXJlL2RlY29oZXJlL3Byb2plY3RzL2ZvcmdlL3NyYy9hY3Rpb25zL3RhZy5hY3Rpb24udHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgaW5qZWN0YWJsZSB9IGZyb20gXCJAZGVjb2hlcmUvY3J1Y2libGUvZGVjb3JhdG9yc1wiO1xuLy8gYmlvbWUtaWdub3JlIGxpbnQvc3R5bGUvdXNlSW1wb3J0VHlwZTogPERJPlxuaW1wb3J0IHsgV29ya3NwYWNlIH0gZnJvbSBcIkBkZWNvaGVyZS9tZXNoXCI7XG5pbXBvcnQgdHlwZSB7IEFjdGlvbiB9IGZyb20gXCJAZGVjb2hlcmUvbmV4dXMvY2xpXCI7XG5pbXBvcnQgeyBBY3Rpb25SZXNwb25zZSB9IGZyb20gXCJAZGVjb2hlcmUvbmV4dXMvY2xpXCI7XG5pbXBvcnQgeyBHaXQgfSBmcm9tIFwiQGRlY29oZXJlL25leHVzL2ludGVyb3BcIjtcbmltcG9ydCB7IHNjcmliZSB9IGZyb20gXCJAZGVjb2hlcmUvc2NyaWJlXCI7XG5pbXBvcnQgeyBGb3JnZUVycm9yLCBmb3JtYXRVbmtub3duRXJyb3IgfSBmcm9tIFwiLi4vZXJyb3JzLmpzXCI7XG5cbmV4cG9ydCB0eXBlIFRhZ09wdGlvbnMgPSB7XG5cdHByZWZpeD86IHN0cmluZztcblx0ZHJ5UnVuPzogYm9vbGVhbjtcblx0cHVzaD86IGJvb2xlYW47XG59O1xuXG5leHBvcnQgdHlwZSBUYWdSZXNwb25zZSA9IHtcblx0dGFnOiBzdHJpbmc7XG5cdHN1Y2NlZWRlZDogYm9vbGVhbjtcblx0ZXJyb3I/OiBzdHJpbmc7XG59O1xuXG5AaW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgVGFnIGltcGxlbWVudHMgQWN0aW9uPFRhZ09wdGlvbnM+IHtcblx0I2xvZ2dlciA9IHNjcmliZS5sb2dnZXIoVGFnLm5hbWUpO1xuXHRwdWJsaWMgY29uc3RydWN0b3IocHJpdmF0ZSByZWFkb25seSB3b3Jrc3BhY2U6IFdvcmtzcGFjZSkge31cblxuXHRwdWJsaWMgYXN5bmMgcnVuKG9wdGlvbnM6IFRhZ09wdGlvbnMpOiBQcm9taXNlPEFjdGlvblJlc3BvbnNlPFRhZ1Jlc3BvbnNlPj4ge1xuXHRcdHRyeSB7XG5cdFx0XHRjb25zdCB2ZXJzaW9uID0gYXdhaXQgdGhpcy53b3Jrc3BhY2UuZ2V0VmVyc2lvbigpO1xuXHRcdFx0Y29uc3QgcHJlZml4ID0gb3B0aW9ucy5wcmVmaXggPz8gXCJ2XCI7XG5cdFx0XHRjb25zdCB0YWcgPSBgJHtwcmVmaXh9JHt2ZXJzaW9ufWA7XG5cblx0XHRcdGlmIChvcHRpb25zLmRyeVJ1bikge1xuXHRcdFx0XHR0aGlzLiNsb2dnZXIuaW5mbyhgW2RyeS1ydW5dICR7dGFnfWApO1xuXHRcdFx0XHRyZXR1cm4gQWN0aW9uUmVzcG9uc2UuU3VjY2VzczxUYWdSZXNwb25zZT4oVGFnLm5hbWUsIFt7IHRhZywgc3VjY2VlZGVkOiB0cnVlIH1dKTtcblx0XHRcdH1cblxuXHRcdFx0dGhpcy4jbG9nZ2VyLmluZm8oYENyZWF0aW5nIHRhZzogJHt0YWd9YCk7XG5cdFx0XHRjb25zdCBnaXQgPSBuZXcgR2l0KCk7XG5cdFx0XHRhd2FpdCBnaXQudGFnKHRhZyk7XG5cblx0XHRcdGlmIChvcHRpb25zLnB1c2gpIHtcblx0XHRcdFx0Y29uc3QgYnJhbmNoID0gYXdhaXQgZ2l0LmdldEJyYW5jaE5hbWUoKTtcblx0XHRcdFx0dGhpcy4jbG9nZ2VyLmluZm8oYFB1c2hpbmcgYnJhbmNoOiAke2JyYW5jaH1gKTtcblx0XHRcdFx0YXdhaXQgZ2l0LnB1c2goYnJhbmNoKTtcblx0XHRcdFx0dGhpcy4jbG9nZ2VyLmluZm8oYFB1c2hpbmcgdGFnOiAke3RhZ31gKTtcblx0XHRcdFx0YXdhaXQgZ2l0LnB1c2hUYWcodGFnKTtcblx0XHRcdH1cblxuXHRcdFx0cmV0dXJuIEFjdGlvblJlc3BvbnNlLlN1Y2Nlc3M8VGFnUmVzcG9uc2U+KFRhZy5uYW1lLCBbeyB0YWcsIHN1Y2NlZWRlZDogdHJ1ZSB9XSk7XG5cdFx0fSBjYXRjaCAocmVhc29uKSB7XG5cdFx0XHRjb25zdCBlcnJvciA9IGZvcm1hdFVua25vd25FcnJvcihyZWFzb24pO1xuXHRcdFx0dGhyb3cgbmV3IEZvcmdlRXJyb3IoYEZhaWxlZCB0byBjcmVhdGUgdGFnOiAke2Vycm9yfWApO1xuXHRcdH1cblx0fVxufVxuIl0sIm5hbWVzIjpbIlRhZyIsInNjcmliZSIsImxvZ2dlciIsIm5hbWUiLCJ3b3Jrc3BhY2UiLCJydW4iLCJvcHRpb25zIiwidmVyc2lvbiIsImdldFZlcnNpb24iLCJwcmVmaXgiLCJ0YWciLCJkcnlSdW4iLCJpbmZvIiwiQWN0aW9uUmVzcG9uc2UiLCJTdWNjZXNzIiwic3VjY2VlZGVkIiwiZ2l0IiwiR2l0IiwicHVzaCIsImJyYW5jaCIsImdldEJyYW5jaE5hbWUiLCJwdXNoVGFnIiwicmVhc29uIiwiZXJyb3IiLCJmb3JtYXRVbmtub3duRXJyb3IiLCJGb3JnZUVycm9yIl0sIm1hcHBpbmdzIjoiOzs7OytCQXNCYUE7OztlQUFBQTs7OzRCQXRCYztzQkFFRDtxQkFFSzt5QkFDWDt3QkFDRzt3QkFDd0I7Ozs7Ozs7Ozs7QUFleEMsTUFBTUE7O0lBQ1osQ0FBQSxNQUFPLEdBQUdDLGNBQU0sQ0FBQ0MsTUFBTSxDQUFDRixJQUFJRyxJQUFJLEVBQUU7SUFDbEMsWUFBbUIsQUFBaUJDLFNBQW9CLENBQUU7YUFBdEJBLFlBQUFBO0lBQXVCO0lBRTNELE1BQWFDLElBQUlDLE9BQW1CLEVBQXdDO1FBQzNFLElBQUk7WUFDSCxNQUFNQyxVQUFVLE1BQU0sSUFBSSxDQUFDSCxTQUFTLENBQUNJLFVBQVU7WUFDL0MsTUFBTUMsU0FBU0gsUUFBUUcsTUFBTSxJQUFJO1lBQ2pDLE1BQU1DLE1BQU0sR0FBR0QsU0FBU0YsU0FBUztZQUVqQyxJQUFJRCxRQUFRSyxNQUFNLEVBQUU7Z0JBQ25CLElBQUksQ0FBQyxDQUFBLE1BQU8sQ0FBQ0MsSUFBSSxDQUFDLENBQUMsVUFBVSxFQUFFRixLQUFLO2dCQUNwQyxPQUFPRyxtQkFBYyxDQUFDQyxPQUFPLENBQWNkLElBQUlHLElBQUksRUFBRTtvQkFBQzt3QkFBRU87d0JBQUtLLFdBQVc7b0JBQUs7aUJBQUU7WUFDaEY7WUFFQSxJQUFJLENBQUMsQ0FBQSxNQUFPLENBQUNILElBQUksQ0FBQyxDQUFDLGNBQWMsRUFBRUYsS0FBSztZQUN4QyxNQUFNTSxNQUFNLElBQUlDLFlBQUc7WUFDbkIsTUFBTUQsSUFBSU4sR0FBRyxDQUFDQTtZQUVkLElBQUlKLFFBQVFZLElBQUksRUFBRTtnQkFDakIsTUFBTUMsU0FBUyxNQUFNSCxJQUFJSSxhQUFhO2dCQUN0QyxJQUFJLENBQUMsQ0FBQSxNQUFPLENBQUNSLElBQUksQ0FBQyxDQUFDLGdCQUFnQixFQUFFTyxRQUFRO2dCQUM3QyxNQUFNSCxJQUFJRSxJQUFJLENBQUNDO2dCQUNmLElBQUksQ0FBQyxDQUFBLE1BQU8sQ0FBQ1AsSUFBSSxDQUFDLENBQUMsYUFBYSxFQUFFRixLQUFLO2dCQUN2QyxNQUFNTSxJQUFJSyxPQUFPLENBQUNYO1lBQ25CO1lBRUEsT0FBT0csbUJBQWMsQ0FBQ0MsT0FBTyxDQUFjZCxJQUFJRyxJQUFJLEVBQUU7Z0JBQUM7b0JBQUVPO29CQUFLSyxXQUFXO2dCQUFLO2FBQUU7UUFDaEYsRUFBRSxPQUFPTyxRQUFRO1lBQ2hCLE1BQU1DLFFBQVFDLElBQUFBLDBCQUFrQixFQUFDRjtZQUNqQyxNQUFNLElBQUlHLGtCQUFVLENBQUMsQ0FBQyxzQkFBc0IsRUFBRUYsT0FBTztRQUN0RDtJQUNEO0FBQ0QifQ==
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "TypeCheck", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return TypeCheck;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _decorators = require("@decohere/crucible/decorators");
|
|
12
|
+
const _mesh = require("@decohere/mesh");
|
|
13
|
+
const _cli = require("@decohere/nexus/cli");
|
|
14
|
+
const _diagnostics = require("@decohere/nexus/diagnostics");
|
|
15
|
+
const _scribe = require("@decohere/scribe");
|
|
16
|
+
const _typescript = /*#__PURE__*/ _interop_require_default(require("typescript"));
|
|
17
|
+
const _errors = require("../errors.js");
|
|
18
|
+
const _typeemitter = require("../services/type-emitter.js");
|
|
19
|
+
function _interop_require_default(obj) {
|
|
20
|
+
return obj && obj.__esModule ? obj : {
|
|
21
|
+
default: obj
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
25
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
26
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
27
|
+
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
28
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
29
|
+
}
|
|
30
|
+
function _ts_metadata(k, v) {
|
|
31
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
32
|
+
}
|
|
33
|
+
class TypeCheck {
|
|
34
|
+
workspace;
|
|
35
|
+
typeEmitter;
|
|
36
|
+
#logger = _scribe.scribe.logger(TypeCheck.name);
|
|
37
|
+
constructor(workspace, typeEmitter){
|
|
38
|
+
this.workspace = workspace;
|
|
39
|
+
this.typeEmitter = typeEmitter;
|
|
40
|
+
}
|
|
41
|
+
run = async (options)=>{
|
|
42
|
+
const projects = this.workspace.getProjects(options.configuration);
|
|
43
|
+
for (const project of projects){
|
|
44
|
+
this.#logger.info(`Type-checking ${project.name}`);
|
|
45
|
+
}
|
|
46
|
+
const { diagnostics, formatted } = await this.typeEmitter.checkProject([
|
|
47
|
+
...projects
|
|
48
|
+
]);
|
|
49
|
+
const errors = diagnostics.filter((diagnostic)=>diagnostic.category === _typescript.default.DiagnosticCategory.Error);
|
|
50
|
+
if (errors.length > 0) {
|
|
51
|
+
throw new _errors.ForgeError(formatted || "Type check failed");
|
|
52
|
+
}
|
|
53
|
+
if (formatted.length > 0) {
|
|
54
|
+
this.#logger.info(formatted);
|
|
55
|
+
}
|
|
56
|
+
return _cli.ActionResponse.Success(TypeCheck.name);
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
TypeCheck = _ts_decorate([
|
|
60
|
+
_diagnostics.Trace,
|
|
61
|
+
(0, _decorators.injectable)(),
|
|
62
|
+
_ts_metadata("design:type", Function),
|
|
63
|
+
_ts_metadata("design:paramtypes", [
|
|
64
|
+
typeof _mesh.Workspace === "undefined" ? Object : _mesh.Workspace,
|
|
65
|
+
typeof _typeemitter.TypeEmitter === "undefined" ? Object : _typeemitter.TypeEmitter
|
|
66
|
+
])
|
|
67
|
+
], TypeCheck);
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "Unlink", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return Unlink;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _promises = /*#__PURE__*/ _interop_require_default(require("node:fs/promises"));
|
|
12
|
+
const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
|
|
13
|
+
const _decorators = require("@decohere/crucible/decorators");
|
|
14
|
+
const _cli = require("@decohere/nexus/cli");
|
|
15
|
+
const _scribe = require("@decohere/scribe");
|
|
16
|
+
const _errors = require("../errors.js");
|
|
17
|
+
const _linkaction = require("./link.action.js");
|
|
18
|
+
function _interop_require_default(obj) {
|
|
19
|
+
return obj && obj.__esModule ? obj : {
|
|
20
|
+
default: obj
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
24
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
25
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
26
|
+
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
27
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
28
|
+
}
|
|
29
|
+
class Unlink {
|
|
30
|
+
#logger = _scribe.scribe.logger(Unlink.name);
|
|
31
|
+
run = async (options)=>{
|
|
32
|
+
const targetDir = _nodepath.default.resolve(options.targetDir);
|
|
33
|
+
const manifestPath = _nodepath.default.join(targetDir, _linkaction.LINK_MANIFEST);
|
|
34
|
+
const manifestStat = await _promises.default.stat(manifestPath).catch(()=>null);
|
|
35
|
+
if (manifestStat == null) {
|
|
36
|
+
throw new _errors.ForgeError(`No link manifest found at "${manifestPath}". Nothing to unlink.`);
|
|
37
|
+
}
|
|
38
|
+
const manifest = JSON.parse(await _promises.default.readFile(manifestPath, "utf8"));
|
|
39
|
+
for (const { packageName, symlinkPath, originalPath } of manifest.links){
|
|
40
|
+
const stat = await _promises.default.lstat(symlinkPath).catch(()=>null);
|
|
41
|
+
if (stat?.isSymbolicLink()) {
|
|
42
|
+
await _promises.default.unlink(symlinkPath);
|
|
43
|
+
this.#logger.trace(`Removed symlink for ${packageName}`);
|
|
44
|
+
}
|
|
45
|
+
if (originalPath != null) {
|
|
46
|
+
const backupStat = await _promises.default.stat(originalPath).catch(()=>null);
|
|
47
|
+
if (backupStat != null) {
|
|
48
|
+
await _promises.default.rename(originalPath, symlinkPath);
|
|
49
|
+
this.#logger.trace(`Restored original dir for ${packageName}`);
|
|
50
|
+
} else {
|
|
51
|
+
// originalPath is a symlink target string — recreate the symlink
|
|
52
|
+
await _promises.default.mkdir(_nodepath.default.dirname(symlinkPath), {
|
|
53
|
+
recursive: true
|
|
54
|
+
});
|
|
55
|
+
await _promises.default.symlink(originalPath, symlinkPath, "dir");
|
|
56
|
+
this.#logger.trace(`Restored original symlink for ${packageName}`);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
this.#logger.info(`Unlinked ${packageName}`);
|
|
60
|
+
}
|
|
61
|
+
await _promises.default.unlink(manifestPath);
|
|
62
|
+
if (manifest.peerNodeModulesDir != null) {
|
|
63
|
+
await _promises.default.rm(manifest.peerNodeModulesDir, {
|
|
64
|
+
recursive: true,
|
|
65
|
+
force: true
|
|
66
|
+
});
|
|
67
|
+
this.#logger.info(`Removed peer node_modules at ${manifest.peerNodeModulesDir}`);
|
|
68
|
+
}
|
|
69
|
+
return _cli.ActionResponse.Success(Unlink.name);
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
Unlink = _ts_decorate([
|
|
73
|
+
(0, _decorators.injectable)()
|
|
74
|
+
], Unlink);
|
|
@@ -83,9 +83,7 @@ class Version {
|
|
|
83
83
|
}
|
|
84
84
|
await workspace.persistPackageJson((await workspace.getPackageJson()).withVersion(nextVersion.toString()));
|
|
85
85
|
const responses = await Promise.all([
|
|
86
|
-
|
|
87
|
-
this.updatePackageJson(workspace.name, workspace, nextVersion)
|
|
88
|
-
],
|
|
86
|
+
this.updatePackageJson(workspace.name, workspace, nextVersion),
|
|
89
87
|
...projects.map((project)=>this.updatePackageJson(project.name, project, nextVersion))
|
|
90
88
|
]);
|
|
91
89
|
const failed = responses.filter((r)=>!r.succeeded);
|
|
@@ -205,5 +203,3 @@ Version = _ts_decorate([
|
|
|
205
203
|
typeof _mesh.Workspace === "undefined" ? Object : _mesh.Workspace
|
|
206
204
|
])
|
|
207
205
|
], Version);
|
|
208
|
-
|
|
209
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["/home/runner/work/decohere/decohere/projects/forge/src/actions/version.action.ts"],"sourcesContent":["import { execSync } from \"node:child_process\";\nimport { readdir, readFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { injectable } from \"@decohere/crucible/decorators\";\nimport type { HasPackageJson } from \"@decohere/mesh\";\n// biome-ignore lint/style/useImportType: <DI>\nimport { Workspace } from \"@decohere/mesh\";\nimport type { Action, ResultStatus } from \"@decohere/nexus/cli\";\nimport { ActionResponse } from \"@decohere/nexus/cli\";\nimport { Git } from \"@decohere/nexus/interop\";\nimport { Semver, SemverError, type VersionType, VersionTypes } from \"@decohere/nexus/semver\";\nimport { scribe } from \"@decohere/scribe\";\nimport { ForgeError, formatUnknownError } from \"../errors.js\";\n\nexport type VersionResponse = ResultStatus & {\n\tname: string;\n};\n\nexport const DefaultChannel = \"beta\";\nexport const DefaultReleaseType = VersionTypes.prerelease;\n\nexport type VersionOptions = {\n\treleaseType?: VersionType;\n\tchannel?: string;\n\tversion?: string;\n\tdryRun?: boolean;\n\tcommit?: boolean;\n\tmessage?: string;\n\t/** Read pending .changeset entries to determine the highest bump type */\n\tfromChangesets?: boolean;\n};\n\nconst DefaultVersionOptions: VersionOptions = {\n\treleaseType: DefaultReleaseType,\n\tchannel: DefaultChannel,\n\tdryRun: false,\n};\n\n@injectable()\nexport class Version implements Action<VersionOptions> {\n\t#logger = scribe.logger(Version.name);\n\tpublic constructor(private readonly workspace: Workspace) {}\n\tpublic async run(options: VersionOptions): Promise<ActionResponse> {\n\t\tconst response = await this.version(this.workspace, options);\n\t\tconst messages = response.data\n\t\t\t.flatMap((d) => (!d.succeeded && d.error ? [d.error] : []))\n\t\t\t.join(\"\\n\");\n\t\tif (messages) {\n\t\t\tthrow new ForgeError(`There was an error versioning the workspace ${messages}`);\n\t\t}\n\n\t\treturn response;\n\t}\n\n\tpublic async version(\n\t\tworkspace: Workspace,\n\t\toptions: VersionOptions = DefaultVersionOptions,\n\t): Promise<ActionResponse<VersionResponse>> {\n\t\tconst projects = workspace.getProjects(\"debug\");\n\t\tconst rootVersion = await this.resolveBaseVersion(workspace, options);\n\t\tconst releaseType = options.fromChangesets\n\t\t\t? await this.resolveReleaseTypeFromChangesets()\n\t\t\t: (options.releaseType ?? DefaultReleaseType);\n\t\tconst channel = options.channel ?? DefaultChannel;\n\t\tconst nextVersion = this.getNextVersion(rootVersion, releaseType, channel);\n\t\tthis.#logger.info(`${rootVersion} → ${nextVersion} [${releaseType}]`);\n\n\t\tif (options.dryRun) {\n\t\t\tthis.#logger.info(\n\t\t\t\t`[dry-run] Would bump all packages to ${nextVersion} — skipping file writes`,\n\t\t\t);\n\t\t\treturn ActionResponse.Success(Version.name, [\n\t\t\t\t{ name: workspace.name, succeeded: true },\n\t\t\t\t...projects.map((p) => ({ name: p.name, succeeded: true })),\n\t\t\t]);\n\t\t}\n\n\t\tawait workspace.persistPackageJson(\n\t\t\t(await workspace.getPackageJson()).withVersion(nextVersion.toString()),\n\t\t);\n\n\t\tconst responses = await Promise.all([\n\t\t\t...[this.updatePackageJson(workspace.name, workspace, nextVersion)],\n\t\t\t...projects.map((project) => this.updatePackageJson(project.name, project, nextVersion)),\n\t\t]);\n\t\tconst failed = responses.filter((r) => !r.succeeded);\n\t\tif (failed.length) {\n\t\t\treturn ActionResponse.Error(Version.name, responses);\n\t\t}\n\n\t\tif (options.commit) {\n\t\t\tconst files = [workspace.packageJsonPath, ...projects.map((p) => p.packageJsonPath)];\n\t\t\tconst message = options.message ?? `chore: version packages ${nextVersion}`;\n\t\t\tthis.#logger.info(`Committing: ${message}`);\n\t\t\tawait new Git().commit(message, { files });\n\t\t}\n\n\t\treturn ActionResponse.Success(Version.name, responses);\n\t}\n\n\tprivate async resolveBaseVersion(\n\t\tworkspace: Workspace,\n\t\toptions: VersionOptions,\n\t): Promise<string> {\n\t\tif (options.version != null && options.version.trim().length > 0) {\n\t\t\treturn options.version.trim();\n\t\t}\n\n\t\tconst gitTagVersion = this.resolveVersionFromGitTag();\n\t\tif (gitTagVersion != null) {\n\t\t\tthis.#logger.info(`Using latest git tag version as base: ${gitTagVersion}`);\n\t\t\treturn gitTagVersion;\n\t\t}\n\n\t\tconst workspaceVersion = await workspace.getVersion();\n\t\tthis.#logger.info(\n\t\t\t`No semver git tags found, falling back to workspace package.json version: ${workspaceVersion}`,\n\t\t);\n\t\treturn workspaceVersion;\n\t}\n\n\tprivate resolveVersionFromGitTag(): string | undefined {\n\t\ttry {\n\t\t\tconst tags = execSync('git tag --list \"v*\" --sort=-version:refname', {\n\t\t\t\tencoding: \"utf8\",\n\t\t\t})\n\t\t\t\t.trim()\n\t\t\t\t.split(\"\\n\")\n\t\t\t\t.filter(Boolean);\n\n\t\t\tif (tags.length === 0) {\n\t\t\t\treturn undefined;\n\t\t\t}\n\n\t\t\treturn tags[0].replace(/^v/, \"\");\n\t\t} catch {\n\t\t\treturn undefined;\n\t\t}\n\t}\n\n\t/**\n\t * Reads all pending .changeset/*.md entries and returns the highest bump type\n\t * found across all of them. Precedence: major > minor > patch.\n\t */\n\tprivate async resolveReleaseTypeFromChangesets(): Promise<VersionType> {\n\t\tconst changesetDir = join(process.cwd(), \".changeset\");\n\t\tlet entries: string[];\n\t\ttry {\n\t\t\tentries = await readdir(changesetDir);\n\t\t} catch {\n\t\t\tthrow new ForgeError(\n\t\t\t\t\"No .changeset directory found. Run `pnpm changeset` to create an entry.\",\n\t\t\t);\n\t\t}\n\n\t\tconst files = entries.filter((e) => e.endsWith(\".md\") && e !== \"README.md\");\n\t\tif (files.length === 0) {\n\t\t\tthrow new ForgeError(\n\t\t\t\t\"No pending changeset entries found in .changeset/. Run `pnpm changeset` to create one.\",\n\t\t\t);\n\t\t}\n\n\t\tconst precedence: Record<string, number> = { major: 3, minor: 2, patch: 1, prerelease: 0 };\n\t\tlet maxType: VersionType = VersionTypes.patch;\n\t\tlet maxPrecedence = 0;\n\n\t\tfor (const file of files) {\n\t\t\tconst content = await readFile(join(changesetDir, file), \"utf8\");\n\t\t\tconst match = content.match(/^---\\n([\\s\\S]*?)\\n---/);\n\t\t\tif (!match) continue;\n\t\t\tfor (const line of match[1].split(\"\\n\")) {\n\t\t\t\tconst bumpType = line.match(/^\"[^\"]+\"\\s*:\\s*(\\w+)/)?.[1] as VersionType | undefined;\n\t\t\t\tconst p = bumpType != null ? (precedence[bumpType] ?? -1) : -1;\n\t\t\t\tif (p > maxPrecedence) {\n\t\t\t\t\tmaxType = bumpType as VersionType;\n\t\t\t\t\tmaxPrecedence = p;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tthis.#logger.info(`Resolved release type from ${files.length} changeset(s): ${maxType}`);\n\t\treturn maxType;\n\t}\n\n\tprivate getNextVersion(\n\t\tcurrentVersion: string,\n\t\tversionType: VersionType,\n\t\tpreid: string,\n\t): Semver {\n\t\ttry {\n\t\t\treturn new Semver(currentVersion).increment(versionType, preid);\n\t\t} catch (error) {\n\t\t\tif (error instanceof SemverError) {\n\t\t\t\tthrow new ForgeError(error.message);\n\t\t\t}\n\n\t\t\tthrow error;\n\t\t}\n\t}\n\n\tprivate async updatePackageJson(\n\t\tname: string,\n\t\thasJson: HasPackageJson,\n\t\tversion: Semver,\n\t): Promise<VersionResponse> {\n\t\ttry {\n\t\t\tconst packageJson = await hasJson.getPackageJson();\n\t\t\tawait hasJson.persistPackageJson(packageJson.withVersion(version.toString()));\n\t\t\tthis.#logger.trace(name);\n\t\t\treturn {\n\t\t\t\tname,\n\t\t\t\tsucceeded: true,\n\t\t\t};\n\t\t} catch (reason) {\n\t\t\treturn {\n\t\t\t\tname,\n\t\t\t\tsucceeded: false,\n\t\t\t\terror: `${name}: ${formatUnknownError(reason)}`,\n\t\t\t};\n\t\t}\n\t}\n}\n"],"names":["DefaultChannel","DefaultReleaseType","Version","VersionTypes","prerelease","DefaultVersionOptions","releaseType","channel","dryRun","scribe","logger","name","workspace","run","options","response","version","messages","data","flatMap","d","succeeded","error","join","ForgeError","projects","getProjects","rootVersion","resolveBaseVersion","fromChangesets","resolveReleaseTypeFromChangesets","nextVersion","getNextVersion","info","ActionResponse","Success","map","p","persistPackageJson","getPackageJson","withVersion","toString","responses","Promise","all","updatePackageJson","project","failed","filter","r","length","Error","commit","files","packageJsonPath","message","Git","trim","gitTagVersion","resolveVersionFromGitTag","workspaceVersion","getVersion","tags","execSync","encoding","split","Boolean","undefined","replace","changesetDir","process","cwd","entries","readdir","e","endsWith","precedence","major","minor","patch","maxType","maxPrecedence","file","content","readFile","match","line","bumpType","currentVersion","versionType","preid","Semver","increment","SemverError","hasJson","packageJson","trace","reason","formatUnknownError"],"mappings":"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"}
|