@git.zone/tspublish 1.15.0 → 2.0.1
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/cli.js +5 -1
- package/dist_ts/00_commitinfo_data.js +3 -3
- package/dist_ts/classes.packagepreparer.js +5 -1
- package/dist_ts/classes.tspublish.d.ts +2 -5
- package/dist_ts/classes.tspublish.js +6 -43
- package/dist_ts/functions.packageplan.d.ts +2 -0
- package/dist_ts/functions.packageplan.js +17 -2
- 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 +33 -22
- package/ts/00_commitinfo_data.ts +2 -2
- package/ts/classes.packagepreparer.ts +3 -0
- package/ts/classes.tspublish.ts +5 -45
- package/ts/functions.packageplan.ts +16 -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
|
@@ -88,6 +88,9 @@ export class PackagePreparer {
|
|
|
88
88
|
const entries = (await plugins.fs.readdir(input)).sort();
|
|
89
89
|
for (const entry of entries) {
|
|
90
90
|
if (entry === 'tspublish.json' && validateImports) continue;
|
|
91
|
+
// A folder's own tsconfig.json configures TsBuild in the repository: the compiled folder already
|
|
92
|
+
// carries its settings, and its `extends` leads to the repository's tsconfig.json, which no package contains.
|
|
93
|
+
if (entry === 'tsconfig.json' && module.folders.includes(source)) continue;
|
|
91
94
|
await this.copyTree(root, `${source}/${entry}`, output, `${destination}/${entry}`, module, validateImports);
|
|
92
95
|
}
|
|
93
96
|
} else if (stat.isFile()) {
|
package/ts/classes.tspublish.ts
CHANGED
|
@@ -1,52 +1,11 @@
|
|
|
1
|
-
import { logInfo, logWarn, logHeader, logPackage, logProgress, logSeparator } from './logging.js';
|
|
2
1
|
import * as plugins from './plugins.js';
|
|
3
2
|
import * as interfaces from './interfaces/index.js';
|
|
4
3
|
|
|
5
|
-
import {
|
|
6
|
-
import { GiteaAssets } from './classes.giteaassets.js';
|
|
7
|
-
import { createPackagePlan, orderPublishModules } from './functions.packageplan.js';
|
|
4
|
+
import { createPackagePlan, orderPublishModules, parseJsonObject } 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
|
-
if (!plan.modules.length) throw new Error('No named tspublish modules were found.');
|
|
24
|
-
logInfo(`Found ${Object.keys(publishModules).length} publish modules`);
|
|
25
|
-
logSeparator();
|
|
26
|
-
for (const publishModule of Object.keys(publishModules)) {
|
|
27
|
-
logPackage('Module found', `${publishModule} → ${publishModules[publishModule].name}`);
|
|
28
|
-
}
|
|
29
|
-
for (const publishModule of Object.keys(publishModules)) {
|
|
30
|
-
// lets check wether there is a name
|
|
31
|
-
if (!publishModules[publishModule].name) {
|
|
32
|
-
logWarn(`No name found in tspublish.json for ${publishModule}. Skipping...`);
|
|
33
|
-
continue;
|
|
34
|
-
}
|
|
35
|
-
const publishModuleInstance = new PublishModule(this, {
|
|
36
|
-
monoRepoDir: monorepoDirArg,
|
|
37
|
-
packageSubFolder: publishModule,
|
|
38
|
-
modulePlan: plan.modules.find((module) => module.folder === publishModule),
|
|
39
|
-
});
|
|
40
|
-
const moduleCount = Object.keys(publishModules).indexOf(publishModule) + 1;
|
|
41
|
-
const totalCount = Object.keys(publishModules).length;
|
|
42
|
-
logProgress(moduleCount, totalCount, publishModules[publishModule].name || publishModule);
|
|
43
|
-
await publishModuleInstance.init();
|
|
44
|
-
await publishModuleInstance.createPublishModuleDir();
|
|
45
|
-
await publishModuleInstance.build();
|
|
46
|
-
await publishModuleInstance.publish();
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
|
|
50
9
|
/** Read-only package discovery, dependency ordering and manifest validation. */
|
|
51
10
|
public async plan(directory: string): Promise<interfaces.ITsPublishPlan> {
|
|
52
11
|
return createPackagePlan(directory, await this.getModuleSubDirs(directory));
|
|
@@ -60,7 +19,7 @@ export class TsPublish {
|
|
|
60
19
|
|
|
61
20
|
/**
|
|
62
21
|
* Discovers every `ts*` descriptor, named or order-only, in dependency order. Build tools and
|
|
63
|
-
* release coordinators call it as a library, so it stays silent
|
|
22
|
+
* release coordinators call it as a library, so it stays silent.
|
|
64
23
|
*/
|
|
65
24
|
public async getModuleSubDirs(dirArg: string) {
|
|
66
25
|
// List all directories
|
|
@@ -82,7 +41,8 @@ export class TsPublish {
|
|
|
82
41
|
}
|
|
83
42
|
|
|
84
43
|
const tspublishContent = await plugins.smartfs.file(tspublishJsonPath).encoding('utf8').read();
|
|
85
|
-
|
|
44
|
+
// Planning validates the fields.
|
|
45
|
+
publishModules[subDirName] = parseJsonObject(tspublishJsonPath, tspublishContent as string) as interfaces.ITsPublishJson;
|
|
86
46
|
}
|
|
87
47
|
|
|
88
48
|
return orderPublishModules(publishModules);
|
|
@@ -12,6 +12,20 @@ export const assertPackagePath = (value: string): void => {
|
|
|
12
12
|
}
|
|
13
13
|
};
|
|
14
14
|
|
|
15
|
+
/** Parses a JSON file that must hold an object; errors name the file, in the words TsBuild uses. */
|
|
16
|
+
export const parseJsonObject = (filePath: string, content: string): object => {
|
|
17
|
+
let parsed: unknown;
|
|
18
|
+
try {
|
|
19
|
+
parsed = JSON.parse(content);
|
|
20
|
+
} catch (error) {
|
|
21
|
+
throw new Error(`Invalid JSON in ${filePath}: ${error instanceof Error ? error.message : String(error)}`);
|
|
22
|
+
}
|
|
23
|
+
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
|
|
24
|
+
throw new Error(`Invalid ${filePath}: expected a JSON object.`);
|
|
25
|
+
}
|
|
26
|
+
return parsed;
|
|
27
|
+
};
|
|
28
|
+
|
|
15
29
|
const record = (value: unknown, label: string): Record<string, unknown> => {
|
|
16
30
|
if (!value || typeof value !== 'object' || Array.isArray(value)) throw new Error(`Invalid ${label}.`);
|
|
17
31
|
return value as Record<string, unknown>;
|
|
@@ -101,7 +115,8 @@ export const createPackagePlan = async (
|
|
|
101
115
|
directory: string,
|
|
102
116
|
discovered: Record<string, ITsPublishJson>,
|
|
103
117
|
): Promise<ITsPublishPlan> => {
|
|
104
|
-
const
|
|
118
|
+
const manifestPath = plugins.path.join(directory, 'package.json');
|
|
119
|
+
const root = parseJsonObject(manifestPath, await plugins.fs.readFile(manifestPath, 'utf8')) as Record<string, unknown>;
|
|
105
120
|
if (typeof root.version !== 'string' || !/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/.test(root.version)) {
|
|
106
121
|
throw new Error('The repository requires a concrete package version.');
|
|
107
122
|
}
|
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');
|
package/ts/plugins.ts
CHANGED
|
@@ -6,19 +6,9 @@ import * as typescript from 'typescript';
|
|
|
6
6
|
export { path, fs, isBuiltin, typescript };
|
|
7
7
|
|
|
8
8
|
// @push.rocks scope
|
|
9
|
-
import * as consolecolor from '@push.rocks/consolecolor';
|
|
10
|
-
import * as smartconfig from '@push.rocks/smartconfig';
|
|
11
|
-
import * as smartfile from '@push.rocks/smartfile';
|
|
12
9
|
import { SmartFs, SmartFsProviderNode } from '@push.rocks/smartfs';
|
|
13
|
-
import * as smartcli from '@push.rocks/smartcli';
|
|
14
|
-
import * as smartdelay from '@push.rocks/smartdelay';
|
|
15
|
-
import * as smartlog from '@push.rocks/smartlog';
|
|
16
|
-
import * as smartnpm from '@push.rocks/smartnpm';
|
|
17
|
-
import * as smartpath from '@push.rocks/smartpath';
|
|
18
|
-
import * as smartrequest from '@push.rocks/smartrequest';
|
|
19
|
-
import * as smartshell from '@push.rocks/smartshell';
|
|
20
10
|
|
|
21
11
|
// Create a pre-configured SmartFs instance for Node.js filesystem operations
|
|
22
12
|
const smartfs = new SmartFs(new SmartFsProviderNode());
|
|
23
13
|
|
|
24
|
-
export {
|
|
14
|
+
export { smartfs };
|
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
interface IRepoFile {
|
|
2
|
-
name: string;
|
|
3
|
-
path: string;
|
|
4
|
-
type: 'file' | 'dir';
|
|
5
|
-
download_url: string | null;
|
|
6
|
-
base64Content: string | null;
|
|
7
|
-
encoding: string | null;
|
|
8
|
-
}
|
|
9
|
-
interface IGiteaAssetsOptions {
|
|
10
|
-
giteaBaseUrl: string;
|
|
11
|
-
token?: string;
|
|
12
|
-
}
|
|
13
|
-
export declare class GiteaAssets {
|
|
14
|
-
private baseUrl;
|
|
15
|
-
private headers;
|
|
16
|
-
constructor(options: IGiteaAssetsOptions);
|
|
17
|
-
/**
|
|
18
|
-
* Get all files in a directory of a repository
|
|
19
|
-
* @param owner - Repository owner
|
|
20
|
-
* @param repo - Repository name
|
|
21
|
-
* @param directory - Directory path ('' for root)
|
|
22
|
-
* @param branch - Branch name (optional)
|
|
23
|
-
* @returns A list of files in the directory
|
|
24
|
-
*/
|
|
25
|
-
getFiles(owner: string, repo: string, directory: string, branch?: string): Promise<IRepoFile[]>;
|
|
26
|
-
/**
|
|
27
|
-
* gets the current cli entry file from the code.foss.global/git.zone/cli repository
|
|
28
|
-
* @returns
|
|
29
|
-
*/
|
|
30
|
-
getBinCliEntryFile(): Promise<IRepoFile>;
|
|
31
|
-
}
|
|
32
|
-
export {};
|
|
@@ -1,81 +0,0 @@
|
|
|
1
|
-
import * as plugins from './plugins.js';
|
|
2
|
-
export class GiteaAssets {
|
|
3
|
-
constructor(options) {
|
|
4
|
-
this.headers = {};
|
|
5
|
-
this.baseUrl = options.giteaBaseUrl;
|
|
6
|
-
if (this.baseUrl.endsWith('/')) {
|
|
7
|
-
this.baseUrl = this.baseUrl.slice(0, -1);
|
|
8
|
-
}
|
|
9
|
-
this.baseUrl += '/api/v1';
|
|
10
|
-
this.headers = options.token
|
|
11
|
-
? { ...this.headers, 'Authorization': `token ${options.token}` }
|
|
12
|
-
: this.headers;
|
|
13
|
-
}
|
|
14
|
-
/**
|
|
15
|
-
* Get all files in a directory of a repository
|
|
16
|
-
* @param owner - Repository owner
|
|
17
|
-
* @param repo - Repository name
|
|
18
|
-
* @param directory - Directory path ('' for root)
|
|
19
|
-
* @param branch - Branch name (optional)
|
|
20
|
-
* @returns A list of files in the directory
|
|
21
|
-
*/
|
|
22
|
-
async getFiles(owner, repo, directory, branch) {
|
|
23
|
-
try {
|
|
24
|
-
const requestBuilder = plugins.smartrequest.SmartRequest.create()
|
|
25
|
-
.url(this.baseUrl + `/repos/${owner}/${repo}/contents/${directory}`)
|
|
26
|
-
.headers(this.headers);
|
|
27
|
-
if (branch) {
|
|
28
|
-
requestBuilder.query({ ref: branch });
|
|
29
|
-
}
|
|
30
|
-
const response = await requestBuilder.get();
|
|
31
|
-
let responseBody = await response.json();
|
|
32
|
-
if (!Array.isArray(responseBody) && typeof responseBody === 'object') {
|
|
33
|
-
responseBody = [responseBody];
|
|
34
|
-
}
|
|
35
|
-
else if (Array.isArray(responseBody)) {
|
|
36
|
-
for (const entry of responseBody) {
|
|
37
|
-
if (entry.type === 'dir') {
|
|
38
|
-
continue;
|
|
39
|
-
}
|
|
40
|
-
else if (entry.type === 'file') {
|
|
41
|
-
const requestBuilder2 = plugins.smartrequest.SmartRequest.create()
|
|
42
|
-
.url(this.baseUrl + `/repos/${owner}/${repo}/contents/${entry.path}`)
|
|
43
|
-
.headers(this.headers);
|
|
44
|
-
if (branch) {
|
|
45
|
-
requestBuilder2.query({ ref: branch });
|
|
46
|
-
}
|
|
47
|
-
const response2 = await requestBuilder2.get();
|
|
48
|
-
const response2Body = await response2.json();
|
|
49
|
-
entry.encoding = response2Body.encoding;
|
|
50
|
-
entry.content = response2Body.content;
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
// lets map to the IRepoFile interface
|
|
55
|
-
responseBody = responseBody.map((entry) => {
|
|
56
|
-
return {
|
|
57
|
-
name: entry.name,
|
|
58
|
-
path: entry.path,
|
|
59
|
-
type: entry.type,
|
|
60
|
-
download_url: entry.download_url,
|
|
61
|
-
base64Content: entry.content,
|
|
62
|
-
encoding: entry.encoding,
|
|
63
|
-
};
|
|
64
|
-
});
|
|
65
|
-
return responseBody;
|
|
66
|
-
}
|
|
67
|
-
catch (error) {
|
|
68
|
-
console.error('Error fetching repository files:', error);
|
|
69
|
-
throw error;
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
/**
|
|
73
|
-
* gets the current cli entry file from the code.foss.global/git.zone/cli repository
|
|
74
|
-
* @returns
|
|
75
|
-
*/
|
|
76
|
-
async getBinCliEntryFile() {
|
|
77
|
-
const files = await this.getFiles('git.zone', 'cli', 'assets/templates/cli/cli.js');
|
|
78
|
-
return files[0];
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5naXRlYWFzc2V0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2NsYXNzZXMuZ2l0ZWFhc3NldHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFjLENBQUM7QUFnQnhDLE1BQU0sT0FBTyxXQUFXO0lBSXRCLFlBQVksT0FBNEI7UUFGaEMsWUFBTyxHQUE0QixFQUFFLENBQUM7UUFHNUMsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFBO1FBQ25DLElBQUksSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUMvQixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzNDLENBQUM7UUFDRCxJQUFJLENBQUMsT0FBTyxJQUFJLFNBQVMsQ0FBQztRQUMxQixJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxLQUFLO1lBQ3hCLENBQUMsQ0FBQyxFQUFFLEdBQUcsSUFBSSxDQUFDLE9BQU8sRUFBRSxlQUFlLEVBQUUsU0FBUyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUU7WUFDaEUsQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDckIsQ0FBQztJQUVEOzs7Ozs7O09BT0c7SUFDSCxLQUFLLENBQUMsUUFBUSxDQUNaLEtBQWEsRUFDYixJQUFZLEVBQ1osU0FBaUIsRUFDakIsTUFBZTtRQUVmLElBQUksQ0FBQztZQUNILE1BQU0sY0FBYyxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsWUFBWSxDQUFDLE1BQU0sRUFBRTtpQkFDOUQsR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLEdBQUcsVUFBVSxLQUFLLElBQUksSUFBSSxhQUFhLFNBQVMsRUFBRSxDQUFDO2lCQUNuRSxPQUFPLENBQUMsSUFBSSxDQUFDLE9B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
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
import { type ITsPublishJson, type ITsPublishModulePlan } from './interfaces/index.js';
|
|
2
|
-
import type { TsPublish } from './classes.tspublish.js';
|
|
3
|
-
export interface IPublishModuleOptions {
|
|
4
|
-
monoRepoDir: string;
|
|
5
|
-
packageSubFolder: string;
|
|
6
|
-
packageSubFolderFullPath?: string;
|
|
7
|
-
tsPublishJson?: ITsPublishJson;
|
|
8
|
-
publishModDirFullPath?: string;
|
|
9
|
-
name?: string;
|
|
10
|
-
version?: string;
|
|
11
|
-
dependencies?: {
|
|
12
|
-
[key: string]: string;
|
|
13
|
-
};
|
|
14
|
-
modulePlan?: ITsPublishModulePlan;
|
|
15
|
-
}
|
|
16
|
-
export interface IResolvedRegistry {
|
|
17
|
-
url: string;
|
|
18
|
-
accessLevel: string;
|
|
19
|
-
}
|
|
20
|
-
export declare class PublishModule {
|
|
21
|
-
tsPublishRef: TsPublish;
|
|
22
|
-
options: IPublishModuleOptions;
|
|
23
|
-
constructor(tsPublishRef: TsPublish, options: IPublishModuleOptions);
|
|
24
|
-
init(): Promise<void>;
|
|
25
|
-
getLatestVersionOfPackage(name: string): Promise<string>;
|
|
26
|
-
createTsconfigJson(): Promise<string>;
|
|
27
|
-
createPackageJson(): Promise<string>;
|
|
28
|
-
createPublishModuleDir(): Promise<void>;
|
|
29
|
-
build(): Promise<void>;
|
|
30
|
-
createBinCliSetup(): Promise<void>;
|
|
31
|
-
/**
|
|
32
|
-
* Resolves the registries to publish to based on tspublish.json configuration.
|
|
33
|
-
* Supports:
|
|
34
|
-
* - "useBase": Use only registries from smartconfig.json
|
|
35
|
-
* - "extendBase": Use base registries + additions, with exclusions via "-" prefix
|
|
36
|
-
* - Explicit registries: Direct registry URLs in format "url:accessLevel"
|
|
37
|
-
*/
|
|
38
|
-
private resolveRegistries;
|
|
39
|
-
publish(): Promise<void>;
|
|
40
|
-
}
|
|
@@ -1,232 +0,0 @@
|
|
|
1
|
-
import * as plugins from './plugins.js';
|
|
2
|
-
import * as paths from './paths.js';
|
|
3
|
-
import { logger, logInfo, logSuccess, logWarn, logError, logBuild, logPublish, logOngoing, logStart, logDone } from './logging.js';
|
|
4
|
-
import {} from './interfaces/index.js';
|
|
5
|
-
export class PublishModule {
|
|
6
|
-
constructor(tsPublishRef, options) {
|
|
7
|
-
this.tsPublishRef = tsPublishRef;
|
|
8
|
-
this.options = options;
|
|
9
|
-
}
|
|
10
|
-
async init() {
|
|
11
|
-
this.options.packageSubFolderFullPath = plugins.path.join(this.options.monoRepoDir, this.options.packageSubFolder);
|
|
12
|
-
// check requirements
|
|
13
|
-
if (!this.options.packageSubFolder.startsWith('ts')) {
|
|
14
|
-
throw new Error('subFolder must start with "ts"');
|
|
15
|
-
}
|
|
16
|
-
const tspublishJsonPath = plugins.path.join(this.options.packageSubFolderFullPath, 'tspublish.json');
|
|
17
|
-
const tspublishJsonContent = await plugins.smartfs.file(tspublishJsonPath).encoding('utf8').read();
|
|
18
|
-
this.options.tsPublishJson = JSON.parse(tspublishJsonContent);
|
|
19
|
-
// the package.json of the parent mono repo
|
|
20
|
-
const packageJsonPath = plugins.path.join(this.options.monoRepoDir, 'package.json');
|
|
21
|
-
const packageJsonContent = await plugins.smartfs.file(packageJsonPath).encoding('utf8').read();
|
|
22
|
-
const monoRepoPackageJson = JSON.parse(packageJsonContent);
|
|
23
|
-
this.options.modulePlan ??= (await this.tsPublishRef.plan(this.options.monoRepoDir)).modules
|
|
24
|
-
.find((module) => module.folder === this.options.packageSubFolder);
|
|
25
|
-
if (!this.options.modulePlan)
|
|
26
|
-
throw new Error('Missing publish module plan.');
|
|
27
|
-
this.options.dependencies = this.options.modulePlan.manifest.dependencies;
|
|
28
|
-
this.options.name = this.options.name || this.options.tsPublishJson.name;
|
|
29
|
-
this.options.version = monoRepoPackageJson.version;
|
|
30
|
-
// now that we have a name and version, lets check if there is already a package under the same name and version.
|
|
31
|
-
const smartnpmInstance = new plugins.smartnpm.NpmRegistry({}); // TODO: pass in options
|
|
32
|
-
let packageInfo;
|
|
33
|
-
try {
|
|
34
|
-
packageInfo = await smartnpmInstance.getPackageInfo(this.options.name);
|
|
35
|
-
}
|
|
36
|
-
catch (error) {
|
|
37
|
-
logWarn(`Package ${this.options.name} does not yet seem to exist. Proceeding in 10 seconds...`);
|
|
38
|
-
await plugins.smartdelay.delayFor(10000);
|
|
39
|
-
}
|
|
40
|
-
if (packageInfo) {
|
|
41
|
-
const availableVersions = packageInfo.allVersions.map((versionArg) => versionArg.version);
|
|
42
|
-
logInfo(`Available versions for ${this.options.name}: ${availableVersions.join(', ')}`);
|
|
43
|
-
if (availableVersions.includes(this.options.version)) {
|
|
44
|
-
logError(`Package ${this.options.name} already exists with version ${this.options.version}`);
|
|
45
|
-
throw new Error(`Package ${this.options.name} already exists with version ${this.options.version}.`);
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
async getLatestVersionOfPackage(name) {
|
|
50
|
-
const smartnpmInstance = new plugins.smartnpm.NpmRegistry({}); // TODO: pass in options
|
|
51
|
-
const packageInfo = await smartnpmInstance.getPackageInfo(name);
|
|
52
|
-
if (!packageInfo) {
|
|
53
|
-
throw new Error(`package ${name} not found`);
|
|
54
|
-
}
|
|
55
|
-
return packageInfo.allVersions[0].version;
|
|
56
|
-
}
|
|
57
|
-
async createTsconfigJson() {
|
|
58
|
-
const tsconfigPath = plugins.path.join(paths.cwd, 'tsconfig.json');
|
|
59
|
-
let originalTsConfig = null;
|
|
60
|
-
if (await plugins.smartfs.file(tsconfigPath).exists()) {
|
|
61
|
-
const tsconfigContent = await plugins.smartfs.file(tsconfigPath).encoding('utf8').read();
|
|
62
|
-
originalTsConfig = JSON.parse(tsconfigContent);
|
|
63
|
-
}
|
|
64
|
-
if (originalTsConfig?.compilerOptions?.paths) {
|
|
65
|
-
for (const path of Object.keys(originalTsConfig.compilerOptions.paths)) {
|
|
66
|
-
originalTsConfig.compilerOptions.paths[path][0] = `.${originalTsConfig.compilerOptions.paths[path][0]}`;
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
const tsconfigJson = {
|
|
70
|
-
compilerOptions: {
|
|
71
|
-
experimentalDecorators: true,
|
|
72
|
-
useDefineForClassFields: false,
|
|
73
|
-
target: 'ES2022',
|
|
74
|
-
module: 'NodeNext',
|
|
75
|
-
moduleResolution: 'NodeNext',
|
|
76
|
-
esModuleInterop: true,
|
|
77
|
-
verbatimModuleSyntax: true,
|
|
78
|
-
paths: originalTsConfig?.compilerOptions?.paths,
|
|
79
|
-
},
|
|
80
|
-
exclude: ['dist_*/**/*.d.ts'],
|
|
81
|
-
};
|
|
82
|
-
return JSON.stringify(tsconfigJson, null, 2);
|
|
83
|
-
}
|
|
84
|
-
async createPackageJson() {
|
|
85
|
-
if (!this.options.modulePlan)
|
|
86
|
-
throw new Error('Publish module must be initialized first.');
|
|
87
|
-
const rootManifest = JSON.parse(await plugins.fs.readFile(plugins.path.join(this.options.monoRepoDir, 'package.json'), 'utf8'));
|
|
88
|
-
const buildVersion = rootManifest.devDependencies?.['@git.zone/tsbuild'] ?? rootManifest.dependencies?.['@git.zone/tsbuild'];
|
|
89
|
-
if (typeof buildVersion !== 'string' || !buildVersion)
|
|
90
|
-
throw new Error('Publishing requires a declared @git.zone/tsbuild version.');
|
|
91
|
-
const packageJson = {
|
|
92
|
-
...this.options.modulePlan.manifest,
|
|
93
|
-
scripts: {
|
|
94
|
-
build: 'tsbuild tsfolders',
|
|
95
|
-
},
|
|
96
|
-
devDependencies: {
|
|
97
|
-
'@git.zone/tsbuild': buildVersion,
|
|
98
|
-
},
|
|
99
|
-
};
|
|
100
|
-
return JSON.stringify(packageJson, null, 2);
|
|
101
|
-
}
|
|
102
|
-
async createPublishModuleDir() {
|
|
103
|
-
logOngoing(`Creating publish directory for ${this.options.name}`);
|
|
104
|
-
this.options.publishModDirFullPath = plugins.path.join(this.options.monoRepoDir, `dist_publish_${this.options.packageSubFolder}`);
|
|
105
|
-
// Ensure empty directory
|
|
106
|
-
const publishDir = plugins.smartfs.directory(this.options.publishModDirFullPath);
|
|
107
|
-
if (await publishDir.exists()) {
|
|
108
|
-
await publishDir.recursive().delete();
|
|
109
|
-
}
|
|
110
|
-
await publishDir.recursive().create();
|
|
111
|
-
// package.json
|
|
112
|
-
const packageJsonPath = plugins.path.join(this.options.publishModDirFullPath, 'package.json');
|
|
113
|
-
await plugins.smartfs.file(packageJsonPath).encoding('utf8').write(await this.createPackageJson());
|
|
114
|
-
// tsconfig.json
|
|
115
|
-
const tsconfigJsonPath = plugins.path.join(this.options.publishModDirFullPath, 'tsconfig.json');
|
|
116
|
-
await plugins.smartfs.file(tsconfigJsonPath).encoding('utf8').write(await this.createTsconfigJson());
|
|
117
|
-
// ts subfolder, the folder that contains the source code and is being transpiled
|
|
118
|
-
for (const folder of this.options.modulePlan.folders) {
|
|
119
|
-
await plugins.smartfs.directory(plugins.path.join(this.options.monoRepoDir, folder)).recursive()
|
|
120
|
-
.copy(plugins.path.join(this.options.publishModDirFullPath, folder));
|
|
121
|
-
}
|
|
122
|
-
for (const path of this.options.modulePlan.include) {
|
|
123
|
-
await plugins.fs.cp(plugins.path.join(this.options.monoRepoDir, path), plugins.path.join(this.options.publishModDirFullPath, path), { recursive: true });
|
|
124
|
-
}
|
|
125
|
-
// readme
|
|
126
|
-
const readmeSrc = plugins.path.join(this.options.packageSubFolderFullPath, 'readme.md');
|
|
127
|
-
const readmeDest = plugins.path.join(this.options.publishModDirFullPath, 'readme.md');
|
|
128
|
-
await plugins.smartfs.file(readmeSrc).copy(readmeDest);
|
|
129
|
-
// license
|
|
130
|
-
const licenseSrc = plugins.path.join(this.options.monoRepoDir, this.options.modulePlan.licenseFile);
|
|
131
|
-
const licenseDest = plugins.path.join(this.options.publishModDirFullPath, this.options.modulePlan.licenseFile);
|
|
132
|
-
await plugins.smartfs.file(licenseSrc).copy(licenseDest);
|
|
133
|
-
// cli stuff
|
|
134
|
-
await this.createBinCliSetup();
|
|
135
|
-
}
|
|
136
|
-
async build() {
|
|
137
|
-
logBuild(`Building ${this.options.name}...`);
|
|
138
|
-
const smartshellInstance = new plugins.smartshell.Smartshell({
|
|
139
|
-
executor: 'bash',
|
|
140
|
-
});
|
|
141
|
-
await smartshellInstance.exec(`cd ${this.options.publishModDirFullPath} && pnpm run build`);
|
|
142
|
-
logSuccess(`Build completed for ${this.options.name}`);
|
|
143
|
-
}
|
|
144
|
-
async createBinCliSetup() {
|
|
145
|
-
const binSetupApplies = !!this.options.tsPublishJson?.bin &&
|
|
146
|
-
Array.isArray(this.options.tsPublishJson.bin) &&
|
|
147
|
-
this.options.tsPublishJson.bin.length > 0;
|
|
148
|
-
if (!binSetupApplies)
|
|
149
|
-
return;
|
|
150
|
-
const indexPath = `./dist_${this.options.packageSubFolder}/index.js`;
|
|
151
|
-
const fileContent = `#!/usr/bin/env node\nprocess.env.CLI_CALL = 'true';\nconst cliTool = await import(${JSON.stringify(indexPath)});\nawait cliTool.runCli();\n`;
|
|
152
|
-
const cliJsPath = plugins.path.join(this.options.publishModDirFullPath, 'cli.js');
|
|
153
|
-
await plugins.smartfs.file(cliJsPath).encoding('utf8').write(fileContent);
|
|
154
|
-
}
|
|
155
|
-
/**
|
|
156
|
-
* Resolves the registries to publish to based on tspublish.json configuration.
|
|
157
|
-
* Supports:
|
|
158
|
-
* - "useBase": Use only registries from smartconfig.json
|
|
159
|
-
* - "extendBase": Use base registries + additions, with exclusions via "-" prefix
|
|
160
|
-
* - Explicit registries: Direct registry URLs in format "url:accessLevel"
|
|
161
|
-
*/
|
|
162
|
-
async resolveRegistries() {
|
|
163
|
-
const rawRegistries = this.options.tsPublishJson?.registries || [];
|
|
164
|
-
// Empty → skip publishing
|
|
165
|
-
if (rawRegistries.length === 0) {
|
|
166
|
-
return [];
|
|
167
|
-
}
|
|
168
|
-
const hasUseBase = rawRegistries.includes('useBase');
|
|
169
|
-
const hasExtendBase = rawRegistries.includes('extendBase');
|
|
170
|
-
let baseRegistries = [];
|
|
171
|
-
let baseAccessLevel = 'public';
|
|
172
|
-
// Load base registries from smartconfig.json if needed
|
|
173
|
-
if (hasUseBase || hasExtendBase) {
|
|
174
|
-
const smartconfigInstance = new plugins.smartconfig.Smartconfig(this.options.monoRepoDir);
|
|
175
|
-
const gitzoneConfig = smartconfigInstance.dataFor('@git.zone/cli', {});
|
|
176
|
-
baseRegistries = gitzoneConfig?.release?.targets?.npm?.registries ?? gitzoneConfig?.release?.registries ?? [];
|
|
177
|
-
baseAccessLevel = gitzoneConfig?.release?.targets?.npm?.accessLevel ?? gitzoneConfig?.release?.accessLevel ?? 'public';
|
|
178
|
-
if (baseRegistries.length === 0) {
|
|
179
|
-
throw new Error(`useBase/extendBase specified in tspublish.json but no registries configured in smartconfig.json at @git.zone/cli.release.registries`);
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
// useBase: Only base registries
|
|
183
|
-
if (hasUseBase) {
|
|
184
|
-
return baseRegistries.map((url) => ({ url, accessLevel: baseAccessLevel }));
|
|
185
|
-
}
|
|
186
|
-
// extendBase: Base registries + additions - exclusions
|
|
187
|
-
if (hasExtendBase) {
|
|
188
|
-
const exclusions = rawRegistries
|
|
189
|
-
.filter((r) => r.startsWith('-'))
|
|
190
|
-
.map((r) => r.slice(1)); // remove '-' prefix
|
|
191
|
-
const additions = rawRegistries.filter((r) => r !== 'extendBase' && !r.startsWith('-'));
|
|
192
|
-
// Filter out excluded base registries
|
|
193
|
-
const result = baseRegistries
|
|
194
|
-
.filter((url) => !exclusions.includes(url))
|
|
195
|
-
.map((url) => ({ url, accessLevel: baseAccessLevel }));
|
|
196
|
-
// Add explicit registries
|
|
197
|
-
for (const addition of additions) {
|
|
198
|
-
const parts = addition.split(':');
|
|
199
|
-
const url = parts[0];
|
|
200
|
-
const access = parts[1] || 'public';
|
|
201
|
-
result.push({ url, accessLevel: access });
|
|
202
|
-
}
|
|
203
|
-
return result;
|
|
204
|
-
}
|
|
205
|
-
// Explicit registries only (original behavior)
|
|
206
|
-
return rawRegistries.map((r) => {
|
|
207
|
-
const parts = r.split(':');
|
|
208
|
-
const url = parts[0];
|
|
209
|
-
const access = parts[1] || 'public';
|
|
210
|
-
return { url, accessLevel: access };
|
|
211
|
-
});
|
|
212
|
-
}
|
|
213
|
-
async publish() {
|
|
214
|
-
const registries = await this.resolveRegistries();
|
|
215
|
-
// Handle empty registries
|
|
216
|
-
if (registries.length === 0) {
|
|
217
|
-
logWarn(`No registries configured for ${this.options.name}. Skipping publish.`);
|
|
218
|
-
return;
|
|
219
|
-
}
|
|
220
|
-
logPublish(`Publishing ${this.options.name} v${this.options.version} to ${registries.length} registry(ies)...`);
|
|
221
|
-
const smartshellInstance = new plugins.smartshell.Smartshell({
|
|
222
|
-
executor: 'bash',
|
|
223
|
-
});
|
|
224
|
-
for (const registry of registries) {
|
|
225
|
-
const registryUrl = registry.url.startsWith('https://') ? registry.url : `https://${registry.url}`;
|
|
226
|
-
logOngoing(`Publishing to ${registryUrl}...`);
|
|
227
|
-
await smartshellInstance.exec(`cd ${this.options.publishModDirFullPath} && pnpm publish ${registry.accessLevel === 'public' ? '--access public' : ''} --no-git-checks --registry ${registryUrl}`);
|
|
228
|
-
}
|
|
229
|
-
logSuccess(`Successfully published ${this.options.name} v${this.options.version}!`);
|
|
230
|
-
}
|
|
231
|
-
}
|
|
232
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.publishmodule.js","sourceRoot":"","sources":["../ts/classes.publishmodule.ts"],"names":[],"mappings":"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"}
|
package/dist_ts/logging.d.ts
DELETED
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import * as plugins from './plugins.js';
|
|
2
|
-
export declare const logger: plugins.smartlog.Smartlog;
|
|
3
|
-
export declare const logInfo: (message: string, data?: any) => void;
|
|
4
|
-
export declare const logSuccess: (message: string, data?: any) => void;
|
|
5
|
-
export declare const logWarn: (message: string, data?: any) => void;
|
|
6
|
-
export declare const logError: (message: string, data?: any) => void;
|
|
7
|
-
export declare const logStart: (operation: string) => void;
|
|
8
|
-
export declare const logDone: (operation: string) => void;
|
|
9
|
-
export declare const logPackage: (message: string, packageName: string) => void;
|
|
10
|
-
export declare const logBuild: (message: string) => void;
|
|
11
|
-
export declare const logPublish: (message: string) => void;
|
|
12
|
-
export declare const logSeparator: () => void;
|
|
13
|
-
export declare const logHeader: (title: string) => void;
|
|
14
|
-
export declare const logOngoing: (text: string) => void;
|
|
15
|
-
export declare const logProgress: (current: number, total: number, item: string) => void;
|