@git.zone/tspublish 1.11.6 → 1.12.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 +23 -7
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.packagepreparer.d.ts +10 -0
- package/dist_ts/classes.packagepreparer.js +146 -0
- package/dist_ts/classes.publishmodule.d.ts +2 -1
- package/dist_ts/classes.publishmodule.js +30 -58
- package/dist_ts/classes.tspublish.d.ts +5 -3
- package/dist_ts/classes.tspublish.js +15 -2
- package/dist_ts/functions.packageplan.d.ts +4 -0
- package/dist_ts/functions.packageplan.js +190 -0
- package/dist_ts/index.d.ts +1 -0
- package/dist_ts/index.js +14 -2
- package/dist_ts/interfaces/tspublish.d.ts +56 -0
- package/dist_ts/plugins.d.ts +5 -2
- package/dist_ts/plugins.js +6 -3
- package/package.json +24 -23
- package/readme.md +146 -246
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.packagepreparer.ts +135 -0
- package/ts/classes.publishmodule.ts +27 -61
- package/ts/classes.tspublish.ts +16 -1
- package/ts/functions.packageplan.ts +182 -0
- package/ts/index.ts +11 -1
- package/ts/interfaces/tspublish.ts +55 -0
- package/ts/plugins.ts +5 -2
- /package/{license → license.md} +0 -0
package/.smartconfig.json
CHANGED
|
@@ -23,14 +23,30 @@
|
|
|
23
23
|
]
|
|
24
24
|
},
|
|
25
25
|
"release": {
|
|
26
|
-
"
|
|
27
|
-
"
|
|
28
|
-
"
|
|
29
|
-
|
|
30
|
-
"
|
|
31
|
-
|
|
26
|
+
"preflight": {
|
|
27
|
+
"test": true,
|
|
28
|
+
"build": true
|
|
29
|
+
},
|
|
30
|
+
"targets": {
|
|
31
|
+
"git": {
|
|
32
|
+
"enabled": true,
|
|
33
|
+
"remote": "origin",
|
|
34
|
+
"pushBranch": true,
|
|
35
|
+
"pushTags": true
|
|
36
|
+
},
|
|
37
|
+
"npm": {
|
|
38
|
+
"enabled": true,
|
|
39
|
+
"registries": [
|
|
40
|
+
"https://verdaccio.lossless.digital",
|
|
41
|
+
"https://registry.npmjs.org"
|
|
42
|
+
],
|
|
43
|
+
"accessLevel": "public"
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
},
|
|
47
|
+
"schemaVersion": 2
|
|
32
48
|
},
|
|
33
49
|
"@ship.zone/szci": {
|
|
34
50
|
"npmGlobalTools": []
|
|
35
51
|
}
|
|
36
|
-
}
|
|
52
|
+
}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/tspublish',
|
|
6
|
-
version: '1.
|
|
6
|
+
version: '1.12.1',
|
|
7
7
|
description: 'A tool to publish multiple, concise, and small packages from monorepos, specifically for TypeScript projects within a git environment.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxxQkFBcUI7SUFDM0IsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHdJQUF3STtDQUN0SixDQUFBIn0=
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { ITsPublishPlan, ITsPublishPreparedModule } from './interfaces/index.js';
|
|
2
|
+
/** Prepares already built modules. It never builds, installs, contacts a registry or publishes. */
|
|
3
|
+
export declare class PackagePreparer {
|
|
4
|
+
private readonly root;
|
|
5
|
+
constructor(root: string);
|
|
6
|
+
prepare(plan: ITsPublishPlan, outputDirectory: string): Promise<ITsPublishPreparedModule[]>;
|
|
7
|
+
private assertExport;
|
|
8
|
+
private copyTree;
|
|
9
|
+
private assertImports;
|
|
10
|
+
}
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
import { assertPackagePath } from './functions.packageplan.js';
|
|
3
|
+
/** Prepares already built modules. It never builds, installs, contacts a registry or publishes. */
|
|
4
|
+
export class PackagePreparer {
|
|
5
|
+
constructor(root) {
|
|
6
|
+
this.root = root;
|
|
7
|
+
}
|
|
8
|
+
async prepare(plan, outputDirectory) {
|
|
9
|
+
const root = await plugins.fs.realpath(this.root);
|
|
10
|
+
const output = plugins.path.resolve(outputDirectory);
|
|
11
|
+
if (output === root || root.startsWith(`${output}${plugins.path.sep}`)) {
|
|
12
|
+
throw new Error('Package preparation requires a separate output directory.');
|
|
13
|
+
}
|
|
14
|
+
for (const module of plan.modules) {
|
|
15
|
+
for (const input of [...module.folders.flatMap((folder) => [folder, `dist_${folder}`]), ...module.include]) {
|
|
16
|
+
const inputPath = plugins.path.join(root, input);
|
|
17
|
+
if (output === inputPath || output.startsWith(`${inputPath}${plugins.path.sep}`)) {
|
|
18
|
+
throw new Error('Package output cannot be nested inside a package input.');
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
// The caller owns the parent; refusing existing output prevents overwriting artifacts.
|
|
23
|
+
const parent = await plugins.fs.realpath(plugins.path.dirname(output));
|
|
24
|
+
if (parent !== plugins.path.dirname(output))
|
|
25
|
+
throw new Error('Package output parent must be canonical.');
|
|
26
|
+
await plugins.fs.mkdir(output, { mode: 0o700 });
|
|
27
|
+
const prepared = [];
|
|
28
|
+
try {
|
|
29
|
+
for (const module of plan.modules) {
|
|
30
|
+
const directory = plugins.path.join(output, module.folder);
|
|
31
|
+
await plugins.fs.mkdir(directory, { mode: 0o700 });
|
|
32
|
+
for (const folder of module.folders) {
|
|
33
|
+
await this.copyTree(root, folder, directory, folder, module);
|
|
34
|
+
await this.copyTree(root, `dist_${folder}`, directory, `dist_${folder}`, module);
|
|
35
|
+
}
|
|
36
|
+
for (const path of module.include)
|
|
37
|
+
await this.copyTree(root, path, directory, path, module);
|
|
38
|
+
await this.copyTree(root, `${module.folder}/readme.md`, directory, 'readme.md', module);
|
|
39
|
+
await this.copyTree(root, module.licenseFile, directory, module.licenseFile, module);
|
|
40
|
+
if (module.manifest.bin) {
|
|
41
|
+
await plugins.fs.writeFile(plugins.path.join(directory, 'cli.js'), `#!/usr/bin/env node\nprocess.env.CLI_CALL = 'true';\nconst cli = await import(${JSON.stringify(`./dist_${module.folder}/index.js`)});\nawait cli.runCli();\n`, { mode: 0o755, flag: 'wx' });
|
|
42
|
+
}
|
|
43
|
+
for (const value of Object.values(module.manifest.exports))
|
|
44
|
+
await this.assertExport(directory, value);
|
|
45
|
+
await plugins.fs.writeFile(plugins.path.join(directory, 'package.json'), `${JSON.stringify(module.manifest, null, 2)}\n`, { flag: 'wx' });
|
|
46
|
+
prepared.push({ ...module, directory });
|
|
47
|
+
}
|
|
48
|
+
return prepared;
|
|
49
|
+
}
|
|
50
|
+
catch (error) {
|
|
51
|
+
await plugins.fs.rm(output, { recursive: true, force: true });
|
|
52
|
+
throw error;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
async assertExport(directory, value) {
|
|
56
|
+
if (value === null)
|
|
57
|
+
return;
|
|
58
|
+
if (typeof value === 'string') {
|
|
59
|
+
const target = await plugins.fs.lstat(plugins.path.join(directory, value));
|
|
60
|
+
if (!target.isFile() || target.isSymbolicLink())
|
|
61
|
+
throw new Error(`Missing regular export file: ${value}`);
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
for (const child of Object.values(value))
|
|
65
|
+
await this.assertExport(directory, child);
|
|
66
|
+
}
|
|
67
|
+
async copyTree(root, source, output, destination, module) {
|
|
68
|
+
assertPackagePath(source);
|
|
69
|
+
assertPackagePath(destination);
|
|
70
|
+
if (source.split('/').some((part) => ['node_modules', '.git', '.npmrc', '.env'].includes(part) || part.startsWith('.env.'))) {
|
|
71
|
+
throw new Error('Package contents cannot include credentials or local runtime directories.');
|
|
72
|
+
}
|
|
73
|
+
// Check every ancestor, including explicitly included nested paths.
|
|
74
|
+
const segments = source.split('/');
|
|
75
|
+
for (let index = 1; index <= segments.length; index++) {
|
|
76
|
+
const stat = await plugins.fs.lstat(plugins.path.join(root, ...segments.slice(0, index)));
|
|
77
|
+
if (stat.isSymbolicLink())
|
|
78
|
+
throw new Error(`Package input cannot be a symlink: ${source}`);
|
|
79
|
+
}
|
|
80
|
+
const input = plugins.path.join(root, source);
|
|
81
|
+
const target = plugins.path.join(output, destination);
|
|
82
|
+
const stat = await plugins.fs.lstat(input);
|
|
83
|
+
if (stat.isDirectory()) {
|
|
84
|
+
await plugins.fs.mkdir(target, { recursive: true });
|
|
85
|
+
const entries = (await plugins.fs.readdir(input)).sort();
|
|
86
|
+
for (const entry of entries) {
|
|
87
|
+
if (entry === 'tspublish.json')
|
|
88
|
+
continue;
|
|
89
|
+
await this.copyTree(root, `${source}/${entry}`, output, `${destination}/${entry}`, module);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
else if (stat.isFile()) {
|
|
93
|
+
if (/\.(?:[cm]?js|[cm]?ts|tsx|jsx)$/.test(source)) {
|
|
94
|
+
this.assertImports(source, await plugins.fs.readFile(input, 'utf8'), module);
|
|
95
|
+
}
|
|
96
|
+
await plugins.fs.mkdir(plugins.path.dirname(target), { recursive: true });
|
|
97
|
+
await plugins.fs.copyFile(input, target, 1); // COPYFILE_EXCL: generated metadata cannot be overwritten.
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
throw new Error(`Package input must be a regular file or directory: ${source}`);
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
assertImports(file, content, module) {
|
|
104
|
+
const ts = plugins.typescript;
|
|
105
|
+
const source = ts.createSourceFile(file, content, ts.ScriptTarget.Latest, true);
|
|
106
|
+
const allowed = new Set([
|
|
107
|
+
module.name,
|
|
108
|
+
...Object.keys(module.manifest.dependencies),
|
|
109
|
+
...Object.keys(module.manifest.optionalDependencies ?? {}),
|
|
110
|
+
...Object.keys(module.manifest.peerDependencies ?? {}),
|
|
111
|
+
]);
|
|
112
|
+
const check = (specifier) => {
|
|
113
|
+
if (plugins.isBuiltin(specifier))
|
|
114
|
+
return;
|
|
115
|
+
if (specifier.startsWith('.')) {
|
|
116
|
+
const target = plugins.path.posix.normalize(plugins.path.posix.join(plugins.path.posix.dirname(file), specifier));
|
|
117
|
+
if (!module.folders.some((folder) => target.startsWith(`${folder}/`) || target.startsWith(`dist_${folder}/`))
|
|
118
|
+
&& !module.include.some((path) => target === path || target.startsWith(`${path}/`))) {
|
|
119
|
+
throw new Error(`${module.name}: cross-package relative import ${specifier} in ${file}; use the published package name.`);
|
|
120
|
+
}
|
|
121
|
+
return;
|
|
122
|
+
}
|
|
123
|
+
const name = specifier.startsWith('@') ? specifier.split('/').slice(0, 2).join('/') : specifier.split('/')[0];
|
|
124
|
+
if (!allowed.has(name))
|
|
125
|
+
throw new Error(`${module.name}: undeclared dependency ${specifier} in ${file}.`);
|
|
126
|
+
};
|
|
127
|
+
const visit = (node) => {
|
|
128
|
+
if ((ts.isImportDeclaration(node) || ts.isExportDeclaration(node)) && node.moduleSpecifier && ts.isStringLiteralLike(node.moduleSpecifier)) {
|
|
129
|
+
check(node.moduleSpecifier.text);
|
|
130
|
+
}
|
|
131
|
+
else if (ts.isImportTypeNode(node) && ts.isLiteralTypeNode(node.argument) && ts.isStringLiteralLike(node.argument.literal)) {
|
|
132
|
+
check(node.argument.literal.text);
|
|
133
|
+
}
|
|
134
|
+
else if (ts.isExternalModuleReference(node) && node.expression && ts.isStringLiteralLike(node.expression)) {
|
|
135
|
+
check(node.expression.text);
|
|
136
|
+
}
|
|
137
|
+
else if (ts.isCallExpression(node) && node.arguments.length && ts.isStringLiteralLike(node.arguments[0])
|
|
138
|
+
&& (node.expression.kind === ts.SyntaxKind.ImportKeyword || (ts.isIdentifier(node.expression) && node.expression.text === 'require'))) {
|
|
139
|
+
check(node.arguments[0].text);
|
|
140
|
+
}
|
|
141
|
+
ts.forEachChild(node, visit);
|
|
142
|
+
};
|
|
143
|
+
visit(source);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.packagepreparer.js","sourceRoot":"","sources":["../ts/classes.packagepreparer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type ITsPublishJson } from './interfaces/index.js';
|
|
1
|
+
import { type ITsPublishJson, type ITsPublishModulePlan } from './interfaces/index.js';
|
|
2
2
|
import type { TsPublish } from './classes.tspublish.js';
|
|
3
3
|
export interface IPublishModuleOptions {
|
|
4
4
|
monoRepoDir: string;
|
|
@@ -11,6 +11,7 @@ export interface IPublishModuleOptions {
|
|
|
11
11
|
dependencies?: {
|
|
12
12
|
[key: string]: string;
|
|
13
13
|
};
|
|
14
|
+
modulePlan?: ITsPublishModulePlan;
|
|
14
15
|
}
|
|
15
16
|
export interface IResolvedRegistry {
|
|
16
17
|
url: string;
|
|
@@ -20,21 +20,11 @@ export class PublishModule {
|
|
|
20
20
|
const packageJsonPath = plugins.path.join(this.options.monoRepoDir, 'package.json');
|
|
21
21
|
const packageJsonContent = await plugins.smartfs.file(packageJsonPath).encoding('utf8').read();
|
|
22
22
|
const monoRepoPackageJson = JSON.parse(packageJsonContent);
|
|
23
|
-
this.options.
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
if (monoRepoPackageJson.dependencies[dependency]) {
|
|
29
|
-
resultDependencies[dependency] = monoRepoPackageJson.dependencies[dependency];
|
|
30
|
-
}
|
|
31
|
-
else {
|
|
32
|
-
resultDependencies[dependency] = monoRepoPackageJson.version;
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
return resultDependencies;
|
|
36
|
-
})(),
|
|
37
|
-
};
|
|
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;
|
|
38
28
|
this.options.name = this.options.name || this.options.tsPublishJson.name;
|
|
39
29
|
this.options.version = monoRepoPackageJson.version;
|
|
40
30
|
// now that we have a name and version, lets check if there is already a package under the same name and version.
|
|
@@ -52,7 +42,7 @@ export class PublishModule {
|
|
|
52
42
|
logInfo(`Available versions for ${this.options.name}: ${availableVersions.join(', ')}`);
|
|
53
43
|
if (availableVersions.includes(this.options.version)) {
|
|
54
44
|
logError(`Package ${this.options.name} already exists with version ${this.options.version}`);
|
|
55
|
-
|
|
45
|
+
throw new Error(`Package ${this.options.name} already exists with version ${this.options.version}.`);
|
|
56
46
|
}
|
|
57
47
|
}
|
|
58
48
|
}
|
|
@@ -92,44 +82,20 @@ export class PublishModule {
|
|
|
92
82
|
return JSON.stringify(tsconfigJson, null, 2);
|
|
93
83
|
}
|
|
94
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.');
|
|
95
91
|
const packageJson = {
|
|
96
|
-
|
|
97
|
-
version: this.options.version,
|
|
98
|
-
type: 'module',
|
|
99
|
-
description: '',
|
|
100
|
-
exports: {
|
|
101
|
-
'.': {
|
|
102
|
-
import: `./dist_${this.options.packageSubFolder}/index.js`,
|
|
103
|
-
},
|
|
104
|
-
},
|
|
92
|
+
...this.options.modulePlan.manifest,
|
|
105
93
|
scripts: {
|
|
106
94
|
build: 'tsbuild tsfolders',
|
|
107
95
|
},
|
|
108
|
-
dependencies: this.options.dependencies,
|
|
109
96
|
devDependencies: {
|
|
110
|
-
'@git.zone/tsbuild':
|
|
97
|
+
'@git.zone/tsbuild': buildVersion,
|
|
111
98
|
},
|
|
112
|
-
files: [
|
|
113
|
-
'ts/**/*',
|
|
114
|
-
'ts_*/**/*',
|
|
115
|
-
'dist/**/*',
|
|
116
|
-
'dist_*/**/*',
|
|
117
|
-
'dist_ts/**/*',
|
|
118
|
-
'dist_ts_web/**/*',
|
|
119
|
-
'assets/**/*',
|
|
120
|
-
'cli.js',
|
|
121
|
-
'.smartconfig.json',
|
|
122
|
-
'readme.md',
|
|
123
|
-
],
|
|
124
|
-
...this.options.tsPublishJson?.bin ? {
|
|
125
|
-
bin: (() => {
|
|
126
|
-
const binObject = {};
|
|
127
|
-
for (const bin of this.options.tsPublishJson.bin) {
|
|
128
|
-
binObject[bin] = `./cli.js`;
|
|
129
|
-
}
|
|
130
|
-
return binObject;
|
|
131
|
-
})()
|
|
132
|
-
} : {},
|
|
133
99
|
};
|
|
134
100
|
return JSON.stringify(packageJson, null, 2);
|
|
135
101
|
}
|
|
@@ -149,18 +115,23 @@ export class PublishModule {
|
|
|
149
115
|
const tsconfigJsonPath = plugins.path.join(this.options.publishModDirFullPath, 'tsconfig.json');
|
|
150
116
|
await plugins.smartfs.file(tsconfigJsonPath).encoding('utf8').write(await this.createTsconfigJson());
|
|
151
117
|
// ts subfolder, the folder that contains the source code and is being transpiled
|
|
152
|
-
const
|
|
153
|
-
|
|
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
|
+
}
|
|
154
125
|
// readme
|
|
155
126
|
const readmeSrc = plugins.path.join(this.options.packageSubFolderFullPath, 'readme.md');
|
|
156
127
|
const readmeDest = plugins.path.join(this.options.publishModDirFullPath, 'readme.md');
|
|
157
128
|
await plugins.smartfs.file(readmeSrc).copy(readmeDest);
|
|
158
129
|
// license
|
|
159
|
-
const licenseSrc = plugins.path.join(this.options.monoRepoDir,
|
|
160
|
-
const licenseDest = plugins.path.join(this.options.publishModDirFullPath,
|
|
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);
|
|
161
132
|
await plugins.smartfs.file(licenseSrc).copy(licenseDest);
|
|
162
133
|
// cli stuff
|
|
163
|
-
this.createBinCliSetup();
|
|
134
|
+
await this.createBinCliSetup();
|
|
164
135
|
}
|
|
165
136
|
async build() {
|
|
166
137
|
logBuild(`Building ${this.options.name}...`);
|
|
@@ -174,9 +145,10 @@ export class PublishModule {
|
|
|
174
145
|
const binSetupApplies = !!this.options.tsPublishJson?.bin &&
|
|
175
146
|
Array.isArray(this.options.tsPublishJson.bin) &&
|
|
176
147
|
this.options.tsPublishJson.bin.length > 0;
|
|
177
|
-
|
|
148
|
+
if (!binSetupApplies)
|
|
149
|
+
return;
|
|
178
150
|
const indexPath = `./dist_${this.options.packageSubFolder}/index.js`;
|
|
179
|
-
const fileContent =
|
|
151
|
+
const fileContent = `#!/usr/bin/env node\nprocess.env.CLI_CALL = 'true';\nconst cliTool = await import(${JSON.stringify(indexPath)});\nawait cliTool.runCli();\n`;
|
|
180
152
|
const cliJsPath = plugins.path.join(this.options.publishModDirFullPath, 'cli.js');
|
|
181
153
|
await plugins.smartfs.file(cliJsPath).encoding('utf8').write(fileContent);
|
|
182
154
|
}
|
|
@@ -201,8 +173,8 @@ export class PublishModule {
|
|
|
201
173
|
if (hasUseBase || hasExtendBase) {
|
|
202
174
|
const smartconfigInstance = new plugins.smartconfig.Smartconfig(this.options.monoRepoDir);
|
|
203
175
|
const gitzoneConfig = smartconfigInstance.dataFor('@git.zone/cli', {});
|
|
204
|
-
baseRegistries = gitzoneConfig?.release?.registries
|
|
205
|
-
baseAccessLevel = gitzoneConfig?.release?.accessLevel
|
|
176
|
+
baseRegistries = gitzoneConfig?.release?.targets?.npm?.registries ?? gitzoneConfig?.release?.registries ?? [];
|
|
177
|
+
baseAccessLevel = gitzoneConfig?.release?.targets?.npm?.accessLevel ?? gitzoneConfig?.release?.accessLevel ?? 'public';
|
|
206
178
|
if (baseRegistries.length === 0) {
|
|
207
179
|
throw new Error(`useBase/extendBase specified in tspublish.json but no registries configured in smartconfig.json at @git.zone/cli.release.registries`);
|
|
208
180
|
}
|
|
@@ -257,4 +229,4 @@ export class PublishModule {
|
|
|
257
229
|
logSuccess(`Successfully published ${this.options.name} v${this.options.version}!`);
|
|
258
230
|
}
|
|
259
231
|
}
|
|
260
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.publishmodule.js","sourceRoot":"","sources":["../ts/classes.publishmodule.ts"],"names":[],"mappings":"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"}
|
|
232
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.publishmodule.js","sourceRoot":"","sources":["../ts/classes.publishmodule.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,9 @@ export declare class TsPublish {
|
|
|
4
4
|
giteaAssetsInstance: GiteaAssets;
|
|
5
5
|
constructor();
|
|
6
6
|
publish(monorepoDirArg: string): Promise<void>;
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
/** Read-only package discovery, dependency ordering and manifest validation. */
|
|
8
|
+
plan(directory: string): Promise<interfaces.ITsPublishPlan>;
|
|
9
|
+
/** Prepare built modules for a release owner; never publishes or contacts a registry. */
|
|
10
|
+
prepare(directory: string, outputDirectory: string): Promise<interfaces.ITsPublishPreparedModule[]>;
|
|
11
|
+
getModuleSubDirs(dirArg: string): Promise<Record<string, interfaces.ITsPublishJson>>;
|
|
10
12
|
}
|
|
@@ -3,6 +3,8 @@ import * as plugins from './plugins.js';
|
|
|
3
3
|
import * as interfaces from './interfaces/index.js';
|
|
4
4
|
import { PublishModule } from './classes.publishmodule.js';
|
|
5
5
|
import { GiteaAssets } from './classes.giteaassets.js';
|
|
6
|
+
import { createPackagePlan, orderPublishModules } from './functions.packageplan.js';
|
|
7
|
+
import { PackagePreparer } from './classes.packagepreparer.js';
|
|
6
8
|
export class TsPublish {
|
|
7
9
|
constructor() {
|
|
8
10
|
this.giteaAssetsInstance = new GiteaAssets({
|
|
@@ -12,6 +14,7 @@ export class TsPublish {
|
|
|
12
14
|
async publish(monorepoDirArg) {
|
|
13
15
|
logHeader('TSPublish - Module Publisher');
|
|
14
16
|
const publishModules = await this.getModuleSubDirs(monorepoDirArg);
|
|
17
|
+
const plan = await createPackagePlan(monorepoDirArg, publishModules);
|
|
15
18
|
logInfo(`Found ${Object.keys(publishModules).length} publish modules`);
|
|
16
19
|
logSeparator();
|
|
17
20
|
for (const publishModule of Object.keys(publishModules)) {
|
|
@@ -26,6 +29,7 @@ export class TsPublish {
|
|
|
26
29
|
const publishModuleInstance = new PublishModule(this, {
|
|
27
30
|
monoRepoDir: monorepoDirArg,
|
|
28
31
|
packageSubFolder: publishModule,
|
|
32
|
+
modulePlan: plan.modules.find((module) => module.folder === publishModule),
|
|
29
33
|
});
|
|
30
34
|
const moduleCount = Object.keys(publishModules).indexOf(publishModule) + 1;
|
|
31
35
|
const totalCount = Object.keys(publishModules).length;
|
|
@@ -36,6 +40,15 @@ export class TsPublish {
|
|
|
36
40
|
await publishModuleInstance.publish();
|
|
37
41
|
}
|
|
38
42
|
}
|
|
43
|
+
/** Read-only package discovery, dependency ordering and manifest validation. */
|
|
44
|
+
async plan(directory) {
|
|
45
|
+
return createPackagePlan(directory, await this.getModuleSubDirs(directory));
|
|
46
|
+
}
|
|
47
|
+
/** Prepare built modules for a release owner; never publishes or contacts a registry. */
|
|
48
|
+
async prepare(directory, outputDirectory) {
|
|
49
|
+
const plan = await this.plan(directory);
|
|
50
|
+
return new PackagePreparer(directory).prepare(plan, outputDirectory);
|
|
51
|
+
}
|
|
39
52
|
async getModuleSubDirs(dirArg) {
|
|
40
53
|
// List all directories
|
|
41
54
|
const dirContents = await plugins.smartfs.directory(dirArg).list();
|
|
@@ -57,7 +70,7 @@ export class TsPublish {
|
|
|
57
70
|
}
|
|
58
71
|
logSuccess(`Found ${Object.keys(publishModules).length} publish modules`);
|
|
59
72
|
logInfo('Ordering publish modules...');
|
|
60
|
-
return publishModules;
|
|
73
|
+
return orderPublishModules(publishModules);
|
|
61
74
|
}
|
|
62
75
|
}
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy50c3B1Ymxpc2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jbGFzc2VzLnRzcHVibGlzaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFFLFdBQVcsRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUNuSixPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEtBQUssVUFBVSxNQUFNLHVCQUF1QixDQUFDO0FBRXBELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDdkQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLG1CQUFtQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDcEYsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBRS9ELE1BQU0sT0FBTyxTQUFTO0lBR3BCO1FBQ0UsSUFBSSxDQUFDLG1CQUFtQixHQUFHLElBQUksV0FBVyxDQUFDO1lBQ3pDLFlBQVksRUFBRSwwQkFBMEI7U0FDekMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVNLEtBQUssQ0FBQyxPQUFPLENBQUMsY0FBc0I7UUFDekMsU0FBUyxDQUFDLDhCQUE4QixDQUFDLENBQUM7UUFDMUMsTUFBTSxjQUFjLEdBQUcsTUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDbkUsTUFBTSxJQUFJLEdBQUcsTUFBTSxpQkFBaUIsQ0FBQyxjQUFjLEVBQUUsY0FBYyxDQUFDLENBQUM7UUFDckUsT0FBTyxDQUFDLFNBQVMsTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQyxNQUFNLGtCQUFrQixD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
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { ITsPublishJson, ITsPublishPlan } from './interfaces/index.js';
|
|
2
|
+
export declare const assertPackagePath: (value: string) => void;
|
|
3
|
+
export declare const orderPublishModules: (modules: Record<string, ITsPublishJson>) => Record<string, ITsPublishJson>;
|
|
4
|
+
export declare const createPackagePlan: (directory: string, discovered: Record<string, ITsPublishJson>) => Promise<ITsPublishPlan>;
|