@git.zone/tspublish 1.14.1 → 2.0.0
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/.smartconfig.json +1 -1
- package/dist_ts/00_commitinfo_data.js +3 -3
- package/dist_ts/classes.tspublish.d.ts +5 -4
- package/dist_ts/classes.tspublish.js +6 -41
- package/dist_ts/functions.packageplan.js +6 -3
- package/dist_ts/index.d.ts +2 -1
- package/dist_ts/index.js +10 -9
- package/dist_ts/paths.d.ts +0 -2
- package/dist_ts/paths.js +1 -4
- package/dist_ts/plugins.d.ts +1 -11
- package/dist_ts/plugins.js +2 -12
- package/package.json +6 -16
- package/readme.md +26 -18
- package/ts/00_commitinfo_data.ts +2 -2
- package/ts/classes.tspublish.ts +5 -44
- package/ts/functions.packageplan.ts +5 -1
- package/ts/index.ts +10 -7
- package/ts/paths.ts +0 -8
- package/ts/plugins.ts +1 -11
- package/dist_ts/classes.giteaassets.d.ts +0 -32
- package/dist_ts/classes.giteaassets.js +0 -81
- package/dist_ts/classes.publishmodule.d.ts +0 -40
- package/dist_ts/classes.publishmodule.js +0 -232
- package/dist_ts/logging.d.ts +0 -15
- package/dist_ts/logging.js +0 -87
- package/ts/classes.giteaassets.ts +0 -108
- package/ts/classes.publishmodule.ts +0 -300
- package/ts/logging.ts +0 -104
package/.smartconfig.json
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
"githost": "code.foss.global",
|
|
6
6
|
"gitscope": "git.zone",
|
|
7
7
|
"gitrepo": "tspublish",
|
|
8
|
-
"description": "A tool to
|
|
8
|
+
"description": "A tool to plan and prepare multiple, concise, and small packages from monorepos, specifically for TypeScript projects within a git environment.",
|
|
9
9
|
"npmPackagename": "@git.zone/tspublish",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"projectDomain": "git.zone",
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/tspublish',
|
|
6
|
-
version: '
|
|
7
|
-
description: 'A tool to
|
|
6
|
+
version: '2.0.0',
|
|
7
|
+
description: 'A tool to plan and prepare multiple, concise, and small packages from monorepos, specifically for TypeScript projects within a git environment.'
|
|
8
8
|
};
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxxQkFBcUI7SUFDM0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLGlKQUFpSjtDQUMvSixDQUFBIn0=
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import * as interfaces from './interfaces/index.js';
|
|
2
|
-
|
|
2
|
+
/** Plans and prepares packages; a release coordinator such as `gitzone release` publishes them. */
|
|
3
3
|
export declare class TsPublish {
|
|
4
|
-
giteaAssetsInstance: GiteaAssets;
|
|
5
|
-
constructor();
|
|
6
|
-
publish(monorepoDirArg: string): Promise<void>;
|
|
7
4
|
/** Read-only package discovery, dependency ordering and manifest validation. */
|
|
8
5
|
plan(directory: string): Promise<interfaces.ITsPublishPlan>;
|
|
9
6
|
/** Prepare built modules for a release owner; never publishes or contacts a registry. */
|
|
10
7
|
prepare(directory: string, outputDirectory: string): Promise<interfaces.ITsPublishPreparedModule[]>;
|
|
8
|
+
/**
|
|
9
|
+
* Discovers every `ts*` descriptor, named or order-only, in dependency order. Build tools and
|
|
10
|
+
* release coordinators call it as a library, so it stays silent.
|
|
11
|
+
*/
|
|
11
12
|
getModuleSubDirs(dirArg: string): Promise<Record<string, interfaces.ITsPublishJson>>;
|
|
12
13
|
}
|
|
@@ -1,45 +1,9 @@
|
|
|
1
|
-
import { logger, logInfo, logSuccess, logWarn, logError, logHeader, logPackage, logProgress, logSeparator, logStart, logDone } from './logging.js';
|
|
2
1
|
import * as plugins from './plugins.js';
|
|
3
2
|
import * as interfaces from './interfaces/index.js';
|
|
4
|
-
import { PublishModule } from './classes.publishmodule.js';
|
|
5
|
-
import { GiteaAssets } from './classes.giteaassets.js';
|
|
6
3
|
import { createPackagePlan, orderPublishModules } from './functions.packageplan.js';
|
|
7
4
|
import { PackagePreparer } from './classes.packagepreparer.js';
|
|
5
|
+
/** Plans and prepares packages; a release coordinator such as `gitzone release` publishes them. */
|
|
8
6
|
export class TsPublish {
|
|
9
|
-
constructor() {
|
|
10
|
-
this.giteaAssetsInstance = new GiteaAssets({
|
|
11
|
-
giteaBaseUrl: 'https://code.foss.global',
|
|
12
|
-
});
|
|
13
|
-
}
|
|
14
|
-
async publish(monorepoDirArg) {
|
|
15
|
-
logHeader('TSPublish - Module Publisher');
|
|
16
|
-
const publishModules = await this.getModuleSubDirs(monorepoDirArg);
|
|
17
|
-
const plan = await createPackagePlan(monorepoDirArg, publishModules);
|
|
18
|
-
logInfo(`Found ${Object.keys(publishModules).length} publish modules`);
|
|
19
|
-
logSeparator();
|
|
20
|
-
for (const publishModule of Object.keys(publishModules)) {
|
|
21
|
-
logPackage('Module found', `${publishModule} → ${publishModules[publishModule].name}`);
|
|
22
|
-
}
|
|
23
|
-
for (const publishModule of Object.keys(publishModules)) {
|
|
24
|
-
// lets check wether there is a name
|
|
25
|
-
if (!publishModules[publishModule].name) {
|
|
26
|
-
logWarn(`No name found in tspublish.json for ${publishModule}. Skipping...`);
|
|
27
|
-
continue;
|
|
28
|
-
}
|
|
29
|
-
const publishModuleInstance = new PublishModule(this, {
|
|
30
|
-
monoRepoDir: monorepoDirArg,
|
|
31
|
-
packageSubFolder: publishModule,
|
|
32
|
-
modulePlan: plan.modules.find((module) => module.folder === publishModule),
|
|
33
|
-
});
|
|
34
|
-
const moduleCount = Object.keys(publishModules).indexOf(publishModule) + 1;
|
|
35
|
-
const totalCount = Object.keys(publishModules).length;
|
|
36
|
-
logProgress(moduleCount, totalCount, publishModules[publishModule].name || publishModule);
|
|
37
|
-
await publishModuleInstance.init();
|
|
38
|
-
await publishModuleInstance.createPublishModuleDir();
|
|
39
|
-
await publishModuleInstance.build();
|
|
40
|
-
await publishModuleInstance.publish();
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
7
|
/** Read-only package discovery, dependency ordering and manifest validation. */
|
|
44
8
|
async plan(directory) {
|
|
45
9
|
return createPackagePlan(directory, await this.getModuleSubDirs(directory));
|
|
@@ -49,6 +13,10 @@ export class TsPublish {
|
|
|
49
13
|
const plan = await this.plan(directory);
|
|
50
14
|
return new PackagePreparer(directory).prepare(plan, outputDirectory);
|
|
51
15
|
}
|
|
16
|
+
/**
|
|
17
|
+
* Discovers every `ts*` descriptor, named or order-only, in dependency order. Build tools and
|
|
18
|
+
* release coordinators call it as a library, so it stays silent.
|
|
19
|
+
*/
|
|
52
20
|
async getModuleSubDirs(dirArg) {
|
|
53
21
|
// List all directories
|
|
54
22
|
const dirContents = await plugins.smartfs.directory(dirArg).list();
|
|
@@ -64,13 +32,10 @@ export class TsPublish {
|
|
|
64
32
|
if (!(await plugins.smartfs.file(tspublishJsonPath).exists())) {
|
|
65
33
|
continue;
|
|
66
34
|
}
|
|
67
|
-
logPackage('Found module', subDirName);
|
|
68
35
|
const tspublishContent = await plugins.smartfs.file(tspublishJsonPath).encoding('utf8').read();
|
|
69
36
|
publishModules[subDirName] = JSON.parse(tspublishContent);
|
|
70
37
|
}
|
|
71
|
-
logSuccess(`Found ${Object.keys(publishModules).length} publish modules`);
|
|
72
|
-
logInfo('Ordering publish modules...');
|
|
73
38
|
return orderPublishModules(publishModules);
|
|
74
39
|
}
|
|
75
40
|
}
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy50c3B1Ymxpc2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jbGFzc2VzLnRzcHVibGlzaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEtBQUssVUFBVSxNQUFNLHVCQUF1QixDQUFDO0FBRXBELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ3BGLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUUvRCxtR0FBbUc7QUFDbkcsTUFBTSxPQUFPLFNBQVM7SUFDcEIsZ0ZBQWdGO0lBQ3pFLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBaUI7UUFDakMsT0FBTyxpQkFBaUIsQ0FBQyxTQUFTLEVBQUUsTUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztJQUM5RSxDQUFDO0lBRUQseUZBQXlGO0lBQ2xGLEtBQUssQ0FBQyxPQUFPLENBQUMsU0FBaUIsRUFBRSxlQUF1QjtRQUM3RCxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDeEMsT0FBTyxJQUFJLGVBQWUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLGVBQWUsQ0FBQyxDQUFDO0lBQ3ZFLENBQUM7SUFFRDs7O09BR0c7SUFDSSxLQUFLLENBQUMsZ0JBQWdCLENBQUMsTUFBYztRQUMxQyx1QkFBdUI7UUFDdkIsTUFBTSxXQUFXLEdBQUcsTUFBTSxPQUFPLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNuRSxNQUFNLGNBQWMsR0FBaUQsRUFBRSxDQUFDO1FBRXhFLEtBQUssTUFBTSxLQUFLLElBQUksV0FBVyxFQUFFLENBQUM7WUFDaEMsTUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQztZQUM5QixJQUFJLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO2dCQUNqQyxTQUFTO1lBQ1gsQ0FBQztZQUVELHNEQUFzRDtZQUN0RCxNQUFNLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsVUFBVSxDQUFDLENBQUM7WUFDekQsTUFBTSxpQkFBaUIsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQztZQUUxRSxJQUFJLENBQUMsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxDQUFDO2dCQUM5RCxTQUFTO1lBQ1gsQ0FBQztZQUVELE1BQU0sZ0JBQWdCLEdBQUcsTUFBTSxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUMvRixjQUFjLENBQUMsVUFBVSxDQUFDLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxnQkFBMEIsQ0FBQyxDQUFDO1FBQ3RFLENBQUM7UUFFRCxPQUFPLG1CQUFtQixDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQzdDLENBQUM7Q0FDRiJ9
|
|
@@ -100,6 +100,11 @@ export const createPackagePlan = async (directory, discovered) => {
|
|
|
100
100
|
throw new Error('The repository requires a concrete package version.');
|
|
101
101
|
}
|
|
102
102
|
const ordered = orderPublishModules(discovered);
|
|
103
|
+
// Order-only descriptors belong to TsBuild. Without a named package there is
|
|
104
|
+
// nothing to license or package, so the plan carries only the shared version.
|
|
105
|
+
if (!Object.values(ordered).some((config) => config.name)) {
|
|
106
|
+
return { schemaVersion: 1, version: root.version, modules: [] };
|
|
107
|
+
}
|
|
103
108
|
const names = new Set(Object.values(ordered).map((config) => config.name).filter(Boolean));
|
|
104
109
|
const owners = new Set();
|
|
105
110
|
const rootDependencies = record(root.dependencies ?? {}, 'root dependencies');
|
|
@@ -218,8 +223,6 @@ export const createPackagePlan = async (directory, discovered) => {
|
|
|
218
223
|
modules.push({ folder, folders, name: config.name, version, order: modules.length, manifest, include,
|
|
219
224
|
...(externalRuntimeAssets.length ? { externalRuntimeAssets } : {}), licenseFile, registries: config.registries ?? [] });
|
|
220
225
|
}
|
|
221
|
-
if (!modules.length)
|
|
222
|
-
throw new Error('No named tspublish modules were found.');
|
|
223
226
|
return { schemaVersion: 1, version, modules };
|
|
224
227
|
};
|
|
225
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"functions.packageplan.js","sourceRoot":"","sources":["../ts/functions.packageplan.ts"],"names":[],"mappings":"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"}
|
|
228
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"functions.packageplan.js","sourceRoot":"","sources":["../ts/functions.packageplan.ts"],"names":[],"mappings":"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"}
|
package/dist_ts/index.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export * from './classes.tspublish.js';
|
|
2
2
|
export type * from './interfaces/index.js';
|
|
3
|
-
|
|
3
|
+
/** Stdout carries only the JSON result, so a release coordinator can parse it. */
|
|
4
|
+
export declare const runCli: (args?: string[]) => Promise<void>;
|
package/dist_ts/index.js
CHANGED
|
@@ -1,22 +1,23 @@
|
|
|
1
1
|
import * as paths from './paths.js';
|
|
2
2
|
import { TsPublish } from './classes.tspublish.js';
|
|
3
|
-
import { logStart } from './logging.js';
|
|
4
3
|
export * from './classes.tspublish.js';
|
|
5
|
-
|
|
6
|
-
|
|
4
|
+
const usage = `Usage: tspublish plan
|
|
5
|
+
tspublish prepare <new-output-directory>
|
|
6
|
+
|
|
7
|
+
tspublish plans and prepares packages; it does not publish them.
|
|
8
|
+
Publish tspublish modules with \`gitzone release\` (@git.zone/cli 7.0 or later).`;
|
|
9
|
+
/** Stdout carries only the JSON result, so a release coordinator can parse it. */
|
|
10
|
+
export const runCli = async (args = process.argv.slice(2)) => {
|
|
7
11
|
const tspublish = new TsPublish();
|
|
8
|
-
const args = process.argv.slice(2);
|
|
9
12
|
if (args[0] === 'plan' && args.length === 1) {
|
|
10
13
|
console.log(JSON.stringify(await tspublish.plan(paths.cwd), null, 2));
|
|
11
14
|
}
|
|
12
15
|
else if (args[0] === 'prepare' && args.length === 2) {
|
|
13
16
|
console.log(JSON.stringify(await tspublish.prepare(paths.cwd, args[1]), null, 2));
|
|
14
17
|
}
|
|
15
|
-
else if (args.length === 0) {
|
|
16
|
-
await tspublish.publish(paths.cwd);
|
|
17
|
-
}
|
|
18
18
|
else {
|
|
19
|
-
|
|
19
|
+
console.error(usage);
|
|
20
|
+
process.exitCode = 1;
|
|
20
21
|
}
|
|
21
22
|
};
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssS0FBSyxNQUFNLFlBQVksQ0FBQztBQUNwQyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFbkQsY0FBYyx3QkFBd0IsQ0FBQztBQUd2QyxNQUFNLEtBQUssR0FBRzs7OztpRkFJbUUsQ0FBQztBQUVsRixrRkFBa0Y7QUFDbEYsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFHLEtBQUssRUFBRSxPQUFpQixPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBaUIsRUFBRTtJQUNwRixNQUFNLFNBQVMsR0FBRyxJQUFJLFNBQVMsRUFBRSxDQUFDO0lBQ2xDLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLE1BQU0sSUFBSSxJQUFJLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQzVDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLFNBQVMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3hFLENBQUM7U0FBTSxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxTQUFTLElBQUksSUFBSSxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUN0RCxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxTQUFTLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDcEYsQ0FBQztTQUFNLENBQUM7UUFDTixPQUFPLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ3JCLE9BQU8sQ0FBQyxRQUFRLEdBQUcsQ0FBQyxDQUFDO0lBQ3ZCLENBQUM7QUFDSCxDQUFDLENBQUMifQ==
|
package/dist_ts/paths.d.ts
CHANGED
package/dist_ts/paths.js
CHANGED
|
@@ -1,5 +1,2 @@
|
|
|
1
|
-
import * as plugins from './plugins.js';
|
|
2
1
|
export const cwd = process.cwd();
|
|
3
|
-
|
|
4
|
-
export const nogitDir = plugins.path.join(packageDir, '.nogit');
|
|
5
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF0aHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9wYXRocy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUV4QyxNQUFNLENBQUMsTUFBTSxHQUFHLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO0FBRWpDLE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FDekMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFDL0QsSUFBSSxDQUNMLENBQUM7QUFDRixNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLFFBQVEsQ0FBQyxDQUFDIn0=
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF0aHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9wYXRocy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLENBQUMsTUFBTSxHQUFHLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDIn0=
|
package/dist_ts/plugins.d.ts
CHANGED
|
@@ -3,16 +3,6 @@ import * as fs from 'node:fs/promises';
|
|
|
3
3
|
import { isBuiltin } from 'node:module';
|
|
4
4
|
import * as typescript from 'typescript';
|
|
5
5
|
export { path, fs, isBuiltin, typescript };
|
|
6
|
-
import * as consolecolor from '@push.rocks/consolecolor';
|
|
7
|
-
import * as smartconfig from '@push.rocks/smartconfig';
|
|
8
|
-
import * as smartfile from '@push.rocks/smartfile';
|
|
9
6
|
import { SmartFs } from '@push.rocks/smartfs';
|
|
10
|
-
import * as smartcli from '@push.rocks/smartcli';
|
|
11
|
-
import * as smartdelay from '@push.rocks/smartdelay';
|
|
12
|
-
import * as smartlog from '@push.rocks/smartlog';
|
|
13
|
-
import * as smartnpm from '@push.rocks/smartnpm';
|
|
14
|
-
import * as smartpath from '@push.rocks/smartpath';
|
|
15
|
-
import * as smartrequest from '@push.rocks/smartrequest';
|
|
16
|
-
import * as smartshell from '@push.rocks/smartshell';
|
|
17
7
|
declare const smartfs: SmartFs;
|
|
18
|
-
export {
|
|
8
|
+
export { smartfs };
|
package/dist_ts/plugins.js
CHANGED
|
@@ -5,18 +5,8 @@ import { isBuiltin } from 'node:module';
|
|
|
5
5
|
import * as typescript from 'typescript';
|
|
6
6
|
export { path, fs, isBuiltin, typescript };
|
|
7
7
|
// @push.rocks scope
|
|
8
|
-
import * as consolecolor from '@push.rocks/consolecolor';
|
|
9
|
-
import * as smartconfig from '@push.rocks/smartconfig';
|
|
10
|
-
import * as smartfile from '@push.rocks/smartfile';
|
|
11
8
|
import { SmartFs, SmartFsProviderNode } from '@push.rocks/smartfs';
|
|
12
|
-
import * as smartcli from '@push.rocks/smartcli';
|
|
13
|
-
import * as smartdelay from '@push.rocks/smartdelay';
|
|
14
|
-
import * as smartlog from '@push.rocks/smartlog';
|
|
15
|
-
import * as smartnpm from '@push.rocks/smartnpm';
|
|
16
|
-
import * as smartpath from '@push.rocks/smartpath';
|
|
17
|
-
import * as smartrequest from '@push.rocks/smartrequest';
|
|
18
|
-
import * as smartshell from '@push.rocks/smartshell';
|
|
19
9
|
// Create a pre-configured SmartFs instance for Node.js filesystem operations
|
|
20
10
|
const smartfs = new SmartFs(new SmartFsProviderNode());
|
|
21
|
-
export {
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
11
|
+
export { smartfs };
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxJQUFJLE1BQU0sV0FBVyxDQUFDO0FBQ2xDLE9BQU8sS0FBSyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDdkMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN4QyxPQUFPLEtBQUssVUFBVSxNQUFNLFlBQVksQ0FBQztBQUN6QyxPQUFPLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFFLENBQUM7QUFFM0Msb0JBQW9CO0FBQ3BCLE9BQU8sRUFBRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVuRSw2RUFBNkU7QUFDN0UsTUFBTSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBQUMsSUFBSSxtQkFBbUIsRUFBRSxDQUFDLENBQUM7QUFFdkQsT0FBTyxFQUFFLE9BQU8sRUFBRSxDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/tspublish",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.0",
|
|
4
4
|
"private": false,
|
|
5
|
-
"description": "A tool to
|
|
5
|
+
"description": "A tool to plan and prepare multiple, concise, and small packages from monorepos, specifically for TypeScript projects within a git environment.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
7
7
|
"typings": "dist_ts/index.d.ts",
|
|
8
8
|
"type": "module",
|
|
@@ -12,11 +12,11 @@
|
|
|
12
12
|
"tspublish": "./cli.js"
|
|
13
13
|
},
|
|
14
14
|
"devDependencies": {
|
|
15
|
-
"@git.zone/tsbuild": "^4.5.
|
|
16
|
-
"@git.zone/tsbundle": "^2.
|
|
15
|
+
"@git.zone/tsbuild": "^4.5.1",
|
|
16
|
+
"@git.zone/tsbundle": "^2.14.0",
|
|
17
17
|
"@git.zone/tsrun": "^2.0.6",
|
|
18
|
-
"@git.zone/tstest": "^6.1.
|
|
19
|
-
"@types/node": "^26.
|
|
18
|
+
"@git.zone/tstest": "^6.1.5",
|
|
19
|
+
"@types/node": "^26.6.1"
|
|
20
20
|
},
|
|
21
21
|
"repository": {
|
|
22
22
|
"type": "git",
|
|
@@ -43,17 +43,7 @@
|
|
|
43
43
|
"readme.md"
|
|
44
44
|
],
|
|
45
45
|
"dependencies": {
|
|
46
|
-
"@push.rocks/consolecolor": "^2.0.4",
|
|
47
|
-
"@push.rocks/smartcli": "^4.3.1",
|
|
48
|
-
"@push.rocks/smartconfig": "^6.2.4",
|
|
49
|
-
"@push.rocks/smartdelay": "^3.1.0",
|
|
50
|
-
"@push.rocks/smartfile": "^13.1.3",
|
|
51
46
|
"@push.rocks/smartfs": "^1.5.1",
|
|
52
|
-
"@push.rocks/smartlog": "^3.2.1 || ^4.0.0",
|
|
53
|
-
"@push.rocks/smartnpm": "^2.1.1",
|
|
54
|
-
"@push.rocks/smartpath": "^6.0.0",
|
|
55
|
-
"@push.rocks/smartrequest": "^5.0.3",
|
|
56
|
-
"@push.rocks/smartshell": "^3.3.8",
|
|
57
47
|
"typescript": "^6.0.3"
|
|
58
48
|
},
|
|
59
49
|
"keywords": [
|
package/readme.md
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
# @git.zone/tspublish
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
Plan and prepare independently installable TypeScript packages from one repository.
|
|
4
4
|
Each component has its own dependency list and package metadata; components share
|
|
5
|
-
the repository version. TsBuild owns compilation.
|
|
6
|
-
all packages before packing,
|
|
5
|
+
the repository version. TsBuild owns compilation. tspublish does not publish:
|
|
6
|
+
`gitzone release` prepares all packages through tspublish before packing,
|
|
7
|
+
journaling and publishing any of them.
|
|
7
8
|
|
|
8
9
|
## Issue Reporting and Security
|
|
9
10
|
|
|
@@ -80,7 +81,7 @@ Supported fields:
|
|
|
80
81
|
| `include` | Exact repository-relative asset files or directories, including applicable notices. No globs or component source/compiled folders; use `folders` to declare source ownership. |
|
|
81
82
|
| `externalRuntimeAssets` | Exact repository-relative files or directories executed by another runtime, such as Deno source. Copied without npm import validation; the package owner must qualify that runtime and its dependency graph. The same filesystem and folder-ownership restrictions as `include` apply. Asset declarations cannot overlap. |
|
|
82
83
|
| `bin` | Executable names using the module's exported `runCli()` entrypoint. Wrappers are generated locally. |
|
|
83
|
-
| `registries` | Destination intent
|
|
84
|
+
| `registries` | Destination intent, returned in the plan for the release coordinator to validate. `gitzone release` requires `["useBase"]`. |
|
|
84
85
|
|
|
85
86
|
Root author, license, repository, homepage, bugs, keywords and funding metadata are
|
|
86
87
|
preserved. The private repository flag, root scripts, unrelated dependencies and
|
|
@@ -175,6 +176,15 @@ const packages = await publisher.prepare(
|
|
|
175
176
|
calls. It rejects duplicate package names, dependency cycles, unknown external
|
|
176
177
|
dependency versions, local dependency links and invalid package paths.
|
|
177
178
|
|
|
179
|
+
A repository in which no descriptor names a package, whether it has only
|
|
180
|
+
order-only descriptors or no `ts*` folders at all, plans as
|
|
181
|
+
`{ schemaVersion: 1, version, modules: [] }` with the root `package.json` version.
|
|
182
|
+
That plan reads no license, so a release coordinator can plan any versioned npm
|
|
183
|
+
repository and decide from `modules.length` whether it has packages to release.
|
|
184
|
+
|
|
185
|
+
Discovery is silent: `getModuleSubDirs()`, `plan()` and `prepare()` write nothing to
|
|
186
|
+
the console, because build tools and release coordinators call them as a library.
|
|
187
|
+
|
|
178
188
|
`prepare()` plans again and materializes the already-built packages. The output
|
|
179
189
|
directory must not exist; its parent must already exist at a canonical path. Output
|
|
180
190
|
cannot be nested inside an input folder. Preparation removes its own incomplete
|
|
@@ -184,33 +194,31 @@ prepared directories and their cleanup.
|
|
|
184
194
|
Neither method installs dependencies, fetches templates, contacts registries,
|
|
185
195
|
publishes packages or terminates the process.
|
|
186
196
|
|
|
187
|
-
The CLI exposes the same operations:
|
|
197
|
+
The CLI exposes the same operations and writes only their JSON result to stdout:
|
|
188
198
|
|
|
189
199
|
```sh
|
|
190
200
|
pnpm exec tspublish plan
|
|
191
201
|
pnpm exec tspublish prepare /absolute/existing-parent/new-package-directory
|
|
192
202
|
```
|
|
193
203
|
|
|
204
|
+
Any other invocation, including a bare `tspublish`, prints usage to stderr and
|
|
205
|
+
exits with status 1.
|
|
206
|
+
|
|
194
207
|
A release coordinator should validate every module's destination intent, prepare
|
|
195
208
|
all modules, pack every package, record the complete immutable artifact set, and
|
|
196
209
|
then publish in the returned dependency order. Publication recovery must reuse
|
|
197
210
|
those retained tarballs rather than rebuilding or preparing again.
|
|
198
211
|
|
|
199
|
-
##
|
|
200
|
-
|
|
201
|
-
The existing `TsPublish.publish(repository)` API and no-argument CLI remain
|
|
202
|
-
available. They build and publish modules sequentially and do not provide
|
|
203
|
-
transaction recovery. Use the owning repository's approved release workflow.
|
|
212
|
+
## Publishing
|
|
204
213
|
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
An empty registry list means build without publishing.
|
|
214
|
+
Publish tspublish modules with `gitzone release` from `@git.zone/cli` 7.0 or later.
|
|
215
|
+
It publishes every named module inside its journaled release, in plan order and
|
|
216
|
+
before the root package, to the registries in `release.targets.npm`; see
|
|
217
|
+
"Publishing independently installable components" in the `@git.zone/cli` readme.
|
|
210
218
|
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
219
|
+
Version 2.0.0 removed the standalone publisher, `TsPublish.publish()` and the bare
|
|
220
|
+
`tspublish` command. Remove package scripts that ran it; `gitzone release` refuses
|
|
221
|
+
to release beside one.
|
|
214
222
|
|
|
215
223
|
## Development
|
|
216
224
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/tspublish',
|
|
6
|
-
version: '
|
|
7
|
-
description: 'A tool to
|
|
6
|
+
version: '2.0.0',
|
|
7
|
+
description: 'A tool to plan and prepare multiple, concise, and small packages from monorepos, specifically for TypeScript projects within a git environment.'
|
|
8
8
|
}
|
package/ts/classes.tspublish.ts
CHANGED
|
@@ -1,51 +1,11 @@
|
|
|
1
|
-
import { logger, logInfo, logSuccess, logWarn, logError, logHeader, logPackage, logProgress, logSeparator, logStart, logDone } from './logging.js';
|
|
2
1
|
import * as plugins from './plugins.js';
|
|
3
2
|
import * as interfaces from './interfaces/index.js';
|
|
4
3
|
|
|
5
|
-
import { PublishModule } from './classes.publishmodule.js';
|
|
6
|
-
import { GiteaAssets } from './classes.giteaassets.js';
|
|
7
4
|
import { createPackagePlan, orderPublishModules } from './functions.packageplan.js';
|
|
8
5
|
import { PackagePreparer } from './classes.packagepreparer.js';
|
|
9
6
|
|
|
7
|
+
/** Plans and prepares packages; a release coordinator such as `gitzone release` publishes them. */
|
|
10
8
|
export class TsPublish {
|
|
11
|
-
public giteaAssetsInstance: GiteaAssets;
|
|
12
|
-
|
|
13
|
-
constructor() {
|
|
14
|
-
this.giteaAssetsInstance = new GiteaAssets({
|
|
15
|
-
giteaBaseUrl: 'https://code.foss.global',
|
|
16
|
-
});
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
public async publish(monorepoDirArg: string) {
|
|
20
|
-
logHeader('TSPublish - Module Publisher');
|
|
21
|
-
const publishModules = await this.getModuleSubDirs(monorepoDirArg);
|
|
22
|
-
const plan = await createPackagePlan(monorepoDirArg, publishModules);
|
|
23
|
-
logInfo(`Found ${Object.keys(publishModules).length} publish modules`);
|
|
24
|
-
logSeparator();
|
|
25
|
-
for (const publishModule of Object.keys(publishModules)) {
|
|
26
|
-
logPackage('Module found', `${publishModule} → ${publishModules[publishModule].name}`);
|
|
27
|
-
}
|
|
28
|
-
for (const publishModule of Object.keys(publishModules)) {
|
|
29
|
-
// lets check wether there is a name
|
|
30
|
-
if (!publishModules[publishModule].name) {
|
|
31
|
-
logWarn(`No name found in tspublish.json for ${publishModule}. Skipping...`);
|
|
32
|
-
continue;
|
|
33
|
-
}
|
|
34
|
-
const publishModuleInstance = new PublishModule(this, {
|
|
35
|
-
monoRepoDir: monorepoDirArg,
|
|
36
|
-
packageSubFolder: publishModule,
|
|
37
|
-
modulePlan: plan.modules.find((module) => module.folder === publishModule),
|
|
38
|
-
});
|
|
39
|
-
const moduleCount = Object.keys(publishModules).indexOf(publishModule) + 1;
|
|
40
|
-
const totalCount = Object.keys(publishModules).length;
|
|
41
|
-
logProgress(moduleCount, totalCount, publishModules[publishModule].name || publishModule);
|
|
42
|
-
await publishModuleInstance.init();
|
|
43
|
-
await publishModuleInstance.createPublishModuleDir();
|
|
44
|
-
await publishModuleInstance.build();
|
|
45
|
-
await publishModuleInstance.publish();
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
|
|
49
9
|
/** Read-only package discovery, dependency ordering and manifest validation. */
|
|
50
10
|
public async plan(directory: string): Promise<interfaces.ITsPublishPlan> {
|
|
51
11
|
return createPackagePlan(directory, await this.getModuleSubDirs(directory));
|
|
@@ -57,6 +17,10 @@ export class TsPublish {
|
|
|
57
17
|
return new PackagePreparer(directory).prepare(plan, outputDirectory);
|
|
58
18
|
}
|
|
59
19
|
|
|
20
|
+
/**
|
|
21
|
+
* Discovers every `ts*` descriptor, named or order-only, in dependency order. Build tools and
|
|
22
|
+
* release coordinators call it as a library, so it stays silent.
|
|
23
|
+
*/
|
|
60
24
|
public async getModuleSubDirs(dirArg: string) {
|
|
61
25
|
// List all directories
|
|
62
26
|
const dirContents = await plugins.smartfs.directory(dirArg).list();
|
|
@@ -76,12 +40,9 @@ export class TsPublish {
|
|
|
76
40
|
continue;
|
|
77
41
|
}
|
|
78
42
|
|
|
79
|
-
logPackage('Found module', subDirName);
|
|
80
43
|
const tspublishContent = await plugins.smartfs.file(tspublishJsonPath).encoding('utf8').read();
|
|
81
44
|
publishModules[subDirName] = JSON.parse(tspublishContent as string);
|
|
82
45
|
}
|
|
83
|
-
logSuccess(`Found ${Object.keys(publishModules).length} publish modules`);
|
|
84
|
-
logInfo('Ordering publish modules...');
|
|
85
46
|
|
|
86
47
|
return orderPublishModules(publishModules);
|
|
87
48
|
}
|
|
@@ -106,6 +106,11 @@ export const createPackagePlan = async (
|
|
|
106
106
|
throw new Error('The repository requires a concrete package version.');
|
|
107
107
|
}
|
|
108
108
|
const ordered = orderPublishModules(discovered);
|
|
109
|
+
// Order-only descriptors belong to TsBuild. Without a named package there is
|
|
110
|
+
// nothing to license or package, so the plan carries only the shared version.
|
|
111
|
+
if (!Object.values(ordered).some((config) => config.name)) {
|
|
112
|
+
return { schemaVersion: 1, version: root.version, modules: [] };
|
|
113
|
+
}
|
|
109
114
|
const names = new Set(Object.values(ordered).map((config) => config.name).filter(Boolean));
|
|
110
115
|
const owners = new Set<string>();
|
|
111
116
|
const rootDependencies = record(root.dependencies ?? {}, 'root dependencies');
|
|
@@ -212,6 +217,5 @@ export const createPackagePlan = async (
|
|
|
212
217
|
modules.push({ folder, folders, name: config.name, version, order: modules.length, manifest, include,
|
|
213
218
|
...(externalRuntimeAssets.length ? { externalRuntimeAssets } : {}), licenseFile, registries: config.registries ?? [] });
|
|
214
219
|
}
|
|
215
|
-
if (!modules.length) throw new Error('No named tspublish modules were found.');
|
|
216
220
|
return { schemaVersion: 1, version, modules };
|
|
217
221
|
};
|
package/ts/index.ts
CHANGED
|
@@ -1,21 +1,24 @@
|
|
|
1
1
|
import * as paths from './paths.js';
|
|
2
2
|
import { TsPublish } from './classes.tspublish.js';
|
|
3
|
-
import { logStart } from './logging.js';
|
|
4
3
|
|
|
5
4
|
export * from './classes.tspublish.js';
|
|
6
5
|
export type * from './interfaces/index.js';
|
|
7
6
|
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
const usage = `Usage: tspublish plan
|
|
8
|
+
tspublish prepare <new-output-directory>
|
|
9
|
+
|
|
10
|
+
tspublish plans and prepares packages; it does not publish them.
|
|
11
|
+
Publish tspublish modules with \`gitzone release\` (@git.zone/cli 7.0 or later).`;
|
|
12
|
+
|
|
13
|
+
/** Stdout carries only the JSON result, so a release coordinator can parse it. */
|
|
14
|
+
export const runCli = async (args: string[] = process.argv.slice(2)): Promise<void> => {
|
|
10
15
|
const tspublish = new TsPublish();
|
|
11
|
-
const args = process.argv.slice(2);
|
|
12
16
|
if (args[0] === 'plan' && args.length === 1) {
|
|
13
17
|
console.log(JSON.stringify(await tspublish.plan(paths.cwd), null, 2));
|
|
14
18
|
} else if (args[0] === 'prepare' && args.length === 2) {
|
|
15
19
|
console.log(JSON.stringify(await tspublish.prepare(paths.cwd, args[1]), null, 2));
|
|
16
|
-
} else if (args.length === 0) {
|
|
17
|
-
await tspublish.publish(paths.cwd);
|
|
18
20
|
} else {
|
|
19
|
-
|
|
21
|
+
console.error(usage);
|
|
22
|
+
process.exitCode = 1;
|
|
20
23
|
}
|
|
21
24
|
};
|
package/ts/paths.ts
CHANGED
|
@@ -1,9 +1 @@
|
|
|
1
|
-
import * as plugins from './plugins.js';
|
|
2
|
-
|
|
3
1
|
export const cwd = process.cwd();
|
|
4
|
-
|
|
5
|
-
export const packageDir = plugins.path.join(
|
|
6
|
-
plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
|
|
7
|
-
'..',
|
|
8
|
-
);
|
|
9
|
-
export const nogitDir = plugins.path.join(packageDir, '.nogit');
|