@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
|
@@ -0,0 +1,190 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
const packageNamePattern = /^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/;
|
|
3
|
+
const folderPattern = /^ts(?:_[a-z0-9_]+)?$/;
|
|
4
|
+
export const assertPackagePath = (value) => {
|
|
5
|
+
if (typeof value !== 'string' || !value || value.includes('\\')
|
|
6
|
+
|| value.split('/').some((part) => !part || part === '.' || part === '..')
|
|
7
|
+
|| /[\x00-\x1f\x7f*?]/.test(value) || plugins.path.isAbsolute(value)) {
|
|
8
|
+
throw new Error(`Invalid package-relative path: ${value}`);
|
|
9
|
+
}
|
|
10
|
+
};
|
|
11
|
+
const record = (value, label) => {
|
|
12
|
+
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
13
|
+
throw new Error(`Invalid ${label}.`);
|
|
14
|
+
return value;
|
|
15
|
+
};
|
|
16
|
+
const dependencyNames = (value, label) => {
|
|
17
|
+
if (!Array.isArray(value) || value.some((name) => typeof name !== 'string' || !packageNamePattern.test(name))
|
|
18
|
+
|| new Set(value).size !== value.length)
|
|
19
|
+
throw new Error(`Invalid ${label}.`);
|
|
20
|
+
return value;
|
|
21
|
+
};
|
|
22
|
+
const assertVersionReference = (value, name) => {
|
|
23
|
+
if (typeof value !== 'string' || !value.trim() || /^(?:file|link|workspace):/.test(value)) {
|
|
24
|
+
throw new Error(`Missing or unsupported published dependency version for ${name}.`);
|
|
25
|
+
}
|
|
26
|
+
return value;
|
|
27
|
+
};
|
|
28
|
+
const stringRecord = (value, label) => {
|
|
29
|
+
const result = record(value, label);
|
|
30
|
+
if (Object.values(result).some((entry) => typeof entry !== 'string' || !entry.trim()))
|
|
31
|
+
throw new Error(`Invalid ${label}.`);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
const legacyEntry = (value, kind) => {
|
|
35
|
+
if (typeof value === 'string')
|
|
36
|
+
return kind === 'main' ? value : undefined;
|
|
37
|
+
if (value === null)
|
|
38
|
+
return undefined;
|
|
39
|
+
if (kind === 'types' && typeof value.types === 'string')
|
|
40
|
+
return value.types;
|
|
41
|
+
for (const condition of ['node', 'import', 'default']) {
|
|
42
|
+
if (value[condition] !== undefined) {
|
|
43
|
+
const result = legacyEntry(value[condition], kind);
|
|
44
|
+
if (result)
|
|
45
|
+
return result;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
return undefined;
|
|
49
|
+
};
|
|
50
|
+
export const orderPublishModules = (modules) => {
|
|
51
|
+
const names = new Map();
|
|
52
|
+
for (const [folder, config] of Object.entries(modules)) {
|
|
53
|
+
if (config.order !== undefined && !Number.isFinite(config.order))
|
|
54
|
+
throw new Error(`Invalid order for ${folder}.`);
|
|
55
|
+
if (config.name) {
|
|
56
|
+
if (!packageNamePattern.test(config.name) || names.has(config.name))
|
|
57
|
+
throw new Error(`Invalid or duplicate package name: ${config.name}`);
|
|
58
|
+
names.set(config.name, folder);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
const pending = new Set(Object.keys(modules));
|
|
62
|
+
const ordered = {};
|
|
63
|
+
while (pending.size) {
|
|
64
|
+
const ready = [...pending].filter((folder) => [...(modules[folder].dependencies ?? []), ...(modules[folder].optionalDependencies ?? [])]
|
|
65
|
+
.every((name) => !names.has(name) || !pending.has(names.get(name)))).sort((a, b) => (modules[a].order ?? Number.MAX_SAFE_INTEGER) - (modules[b].order ?? Number.MAX_SAFE_INTEGER)
|
|
66
|
+
|| a.localeCompare(b, 'en'));
|
|
67
|
+
if (!ready.length)
|
|
68
|
+
throw new Error(`Cyclic publish dependencies: ${[...pending].join(', ')}`);
|
|
69
|
+
const folder = ready[0];
|
|
70
|
+
ordered[folder] = modules[folder];
|
|
71
|
+
pending.delete(folder);
|
|
72
|
+
}
|
|
73
|
+
return ordered;
|
|
74
|
+
};
|
|
75
|
+
const validateExport = (value, folders) => {
|
|
76
|
+
if (value === null)
|
|
77
|
+
return;
|
|
78
|
+
if (typeof value === 'string') {
|
|
79
|
+
if (!value.startsWith('./'))
|
|
80
|
+
throw new Error('Package export targets must be relative.');
|
|
81
|
+
assertPackagePath(value.slice(2));
|
|
82
|
+
if (!folders.some((folder) => value.startsWith(`./dist_${folder}/`))) {
|
|
83
|
+
throw new Error(`Export target is outside this package's compiled folders: ${value}`);
|
|
84
|
+
}
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
for (const child of Object.values(record(value, 'export conditions')))
|
|
88
|
+
validateExport(child, folders);
|
|
89
|
+
};
|
|
90
|
+
export const createPackagePlan = async (directory, discovered) => {
|
|
91
|
+
const root = record(JSON.parse(await plugins.fs.readFile(plugins.path.join(directory, 'package.json'), 'utf8')), 'root manifest');
|
|
92
|
+
if (typeof root.version !== 'string' || !/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/.test(root.version)) {
|
|
93
|
+
throw new Error('The repository requires a concrete package version.');
|
|
94
|
+
}
|
|
95
|
+
const ordered = orderPublishModules(discovered);
|
|
96
|
+
const names = new Set(Object.values(ordered).map((config) => config.name).filter(Boolean));
|
|
97
|
+
const owners = new Set();
|
|
98
|
+
const rootDependencies = record(root.dependencies ?? {}, 'root dependencies');
|
|
99
|
+
const version = root.version;
|
|
100
|
+
let licenseFile = 'license.md';
|
|
101
|
+
try {
|
|
102
|
+
await plugins.fs.access(plugins.path.join(directory, licenseFile));
|
|
103
|
+
}
|
|
104
|
+
catch (error) {
|
|
105
|
+
if (error.code !== 'ENOENT')
|
|
106
|
+
throw error;
|
|
107
|
+
licenseFile = 'license';
|
|
108
|
+
await plugins.fs.access(plugins.path.join(directory, licenseFile));
|
|
109
|
+
}
|
|
110
|
+
const modules = [];
|
|
111
|
+
for (const [folder, config] of Object.entries(ordered)) {
|
|
112
|
+
if (!config.name)
|
|
113
|
+
continue; // tsbuild also consumes order-only descriptors.
|
|
114
|
+
const folders = [folder, ...(config.folders ?? [])];
|
|
115
|
+
if (folders.some((name) => !folderPattern.test(name) || owners.has(name)) || new Set(folders).size !== folders.length) {
|
|
116
|
+
throw new Error(`Invalid or multiply owned source folder for ${config.name}.`);
|
|
117
|
+
}
|
|
118
|
+
folders.forEach((name) => owners.add(name));
|
|
119
|
+
const resolveDependencies = (value, label) => Object.fromEntries(dependencyNames(value, label).map((name) => [name, names.has(name)
|
|
120
|
+
? version : assertVersionReference(rootDependencies[name], name)]));
|
|
121
|
+
const dependencies = resolveDependencies(config.dependencies ?? [], `${config.name} dependencies`);
|
|
122
|
+
const optionalDependencies = config.optionalDependencies
|
|
123
|
+
? resolveDependencies(config.optionalDependencies, `${config.name} optional dependencies`) : undefined;
|
|
124
|
+
for (const [name, range] of Object.entries(stringRecord(config.peerDependencies ?? {}, 'peer dependencies'))) {
|
|
125
|
+
if (!packageNamePattern.test(name))
|
|
126
|
+
throw new Error(`Invalid peer dependency: ${name}`);
|
|
127
|
+
assertVersionReference(range, name);
|
|
128
|
+
}
|
|
129
|
+
for (const [name, metadataValue] of Object.entries(record(config.peerDependenciesMeta ?? {}, 'peer metadata'))) {
|
|
130
|
+
const metadata = record(metadataValue, 'peer metadata');
|
|
131
|
+
if (!(name in (config.peerDependencies ?? {})) || Object.keys(record(metadata, 'peer metadata')).some((key) => key !== 'optional')
|
|
132
|
+
|| (metadata.optional !== undefined && typeof metadata.optional !== 'boolean'))
|
|
133
|
+
throw new Error(`Invalid peer metadata for ${name}.`);
|
|
134
|
+
}
|
|
135
|
+
const exports = record(config.exports ?? { '.': { types: `./dist_${folder}/index.d.ts`, import: `./dist_${folder}/index.js` } }, 'package exports');
|
|
136
|
+
for (const [key, target] of Object.entries(exports)) {
|
|
137
|
+
if (key !== '.' && !key.startsWith('./'))
|
|
138
|
+
throw new Error(`Invalid package export: ${key}`);
|
|
139
|
+
if (key !== '.')
|
|
140
|
+
assertPackagePath(key.slice(2));
|
|
141
|
+
validateExport(target, folders);
|
|
142
|
+
}
|
|
143
|
+
if (!exports['.'])
|
|
144
|
+
throw new Error(`${config.name} requires a root export.`);
|
|
145
|
+
const include = config.include ?? [];
|
|
146
|
+
if (!Array.isArray(include) || new Set(include).size !== include.length)
|
|
147
|
+
throw new Error('Invalid package include paths.');
|
|
148
|
+
include.forEach(assertPackagePath);
|
|
149
|
+
if (include.some((path) => ['package.json', 'readme.md', 'cli.js', 'node_modules', '.git'].includes(path.split('/')[0])
|
|
150
|
+
|| folderPattern.test(path.split('/')[0]) || /^dist_ts(?:_[a-z0-9_]+)?$/.test(path.split('/')[0])
|
|
151
|
+
|| folders.some((folder) => path === folder || path.startsWith(`${folder}/`) || path === `dist_${folder}` || path.startsWith(`dist_${folder}/`)))) {
|
|
152
|
+
throw new Error('Explicit includes cannot replace generated package files or source folders.');
|
|
153
|
+
}
|
|
154
|
+
const bin = config.bin ?? [];
|
|
155
|
+
if (!Array.isArray(bin) || bin.some((name) => typeof name !== 'string' || !/^[a-z0-9][a-z0-9._-]*$/.test(name)))
|
|
156
|
+
throw new Error('Invalid package binaries.');
|
|
157
|
+
const metadata = Object.fromEntries(['author', 'license', 'repository', 'homepage', 'bugs', 'keywords', 'funding'].filter((key) => root[key] !== undefined).map((key) => [key, root[key]]));
|
|
158
|
+
const description = config.description ?? root.description ?? '';
|
|
159
|
+
if (typeof description !== 'string')
|
|
160
|
+
throw new Error('Invalid package description.');
|
|
161
|
+
const engines = config.engines ?? root.engines;
|
|
162
|
+
if (engines !== undefined)
|
|
163
|
+
stringRecord(engines, 'package engines');
|
|
164
|
+
if (config.sideEffects !== undefined && typeof config.sideEffects !== 'boolean'
|
|
165
|
+
&& (!Array.isArray(config.sideEffects) || config.sideEffects.some((value) => typeof value !== 'string' || !value.trim()))) {
|
|
166
|
+
throw new Error('Invalid sideEffects metadata.');
|
|
167
|
+
}
|
|
168
|
+
const main = legacyEntry(exports['.'], 'main');
|
|
169
|
+
const types = legacyEntry(exports['.'], 'types');
|
|
170
|
+
const manifest = {
|
|
171
|
+
...metadata, name: config.name, version, type: 'module', description,
|
|
172
|
+
...(main ? { main } : {}), ...(types ? { types } : {}), exports, dependencies,
|
|
173
|
+
...(optionalDependencies ? { optionalDependencies } : {}),
|
|
174
|
+
...(config.peerDependencies ? { peerDependencies: config.peerDependencies } : {}),
|
|
175
|
+
...(config.peerDependenciesMeta ? { peerDependenciesMeta: config.peerDependenciesMeta } : {}),
|
|
176
|
+
...(engines !== undefined ? { engines: engines } : {}),
|
|
177
|
+
...(config.sideEffects !== undefined ? { sideEffects: config.sideEffects } : {}),
|
|
178
|
+
...(bin.length ? { bin: Object.fromEntries(bin.map((name) => [name, './cli.js'])) } : {}),
|
|
179
|
+
files: [...folders.flatMap((name) => [name, `dist_${name}`]), ...include, 'readme.md', licenseFile, ...(bin.length ? ['cli.js'] : [])],
|
|
180
|
+
};
|
|
181
|
+
if (config.registries !== undefined && (!Array.isArray(config.registries) || config.registries.some((registry) => typeof registry !== 'string' || !registry.trim() || registry !== registry.trim() || /[\x00-\x1f\x7f]/.test(registry)))) {
|
|
182
|
+
throw new Error(`Invalid registry declarations for ${config.name}.`);
|
|
183
|
+
}
|
|
184
|
+
modules.push({ folder, folders, name: config.name, version, order: modules.length, manifest, include, licenseFile, registries: config.registries ?? [] });
|
|
185
|
+
}
|
|
186
|
+
if (!modules.length)
|
|
187
|
+
throw new Error('No named tspublish modules were found.');
|
|
188
|
+
return { schemaVersion: 1, version, modules };
|
|
189
|
+
};
|
|
190
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"functions.packageplan.js","sourceRoot":"","sources":["../ts/functions.packageplan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAGxC,MAAM,kBAAkB,GAAG,oDAAoD,CAAC;AAChF,MAAM,aAAa,GAAG,sBAAsB,CAAC;AAE7C,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,KAAa,EAAQ,EAAE;IACvD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;WAC1D,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,CAAC;WACvE,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,kCAAkC,KAAK,EAAE,CAAC,CAAC;IAC7D,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,CAAC,KAAc,EAAE,KAAa,EAA2B,EAAE;IACxE,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,WAAW,KAAK,GAAG,CAAC,CAAC;IACtG,OAAO,KAAgC,CAAC;AAC1C,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,KAAc,EAAE,KAAa,EAAY,EAAE;IAClE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;WACxG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,WAAW,KAAK,GAAG,CAAC,CAAC;IAChF,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,KAAc,EAAE,IAAY,EAAU,EAAE;IACtE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1F,MAAM,IAAI,KAAK,CAAC,2DAA2D,IAAI,GAAG,CAAC,CAAC;IACtF,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,KAAc,EAAE,KAAa,EAA0B,EAAE;IAC7E,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACpC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,WAAW,KAAK,GAAG,CAAC,CAAC;IAC5H,OAAO,MAAgC,CAAC;AAC1C,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,KAAuB,EAAE,IAAsB,EAAsB,EAAE;IAC1F,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1E,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IACrC,IAAI,IAAI,KAAK,OAAO,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC,KAAK,CAAC;IAC5E,KAAK,MAAM,SAAS,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,CAAC;QACtD,IAAI,KAAK,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;YACnD,IAAI,MAAM;gBAAE,OAAO,MAAM,CAAC;QAC5B,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,OAAuC,EACP,EAAE;IAClC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;IACxC,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACvD,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,MAAM,GAAG,CAAC,CAAC;QAClH,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAChB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAC1I,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAmC,EAAE,CAAC;IACnD,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAC3C,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;aACvF,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,CAAC,CACvE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,gBAAgB,CAAC;eACzG,CAAC,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9F,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACxB,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAClC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,KAAuB,EAAE,OAAiB,EAAQ,EAAE;IAC1E,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO;IAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QACzF,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;YACrE,MAAM,IAAI,KAAK,CAAC,6DAA6D,KAAK,EAAE,CAAC,CAAC;QACxF,CAAC;QACD,OAAO;IACT,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC;QAAE,cAAc,CAAC,KAAyB,EAAE,OAAO,CAAC,CAAC;AAC5H,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,SAAiB,EACjB,UAA0C,EACjB,EAAE;IAC3B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;IAClI,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,0DAA0D,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACvH,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC;IACD,MAAM,OAAO,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3F,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,EAAE,mBAAmB,CAAC,CAAC;IAC9E,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC7B,IAAI,WAAW,GAAG,YAAY,CAAC;IAC/B,IAAI,CAAC;QAAC,MAAM,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;IAAC,CAAC;IAC3E,OAAO,KAAK,EAAE,CAAC;QACb,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,MAAM,KAAK,CAAC;QACpE,WAAW,GAAG,SAAS,CAAC;QACxB,MAAM,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;IACrE,CAAC;IACD,MAAM,OAAO,GAA8B,EAAE,CAAC;IAC9C,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACvD,IAAI,CAAC,MAAM,CAAC,IAAI;YAAE,SAAS,CAAC,gDAAgD;QAC5E,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;QACpD,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC;YACtH,MAAM,IAAI,KAAK,CAAC,+CAA+C,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;QACjF,CAAC;QACD,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5C,MAAM,mBAAmB,GAAG,CAAC,KAAc,EAAE,KAAa,EAA0B,EAAE,CAAC,MAAM,CAAC,WAAW,CACvG,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;gBAChE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CACrE,CAAC;QACF,MAAM,YAAY,GAAG,mBAAmB,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,eAAe,CAAC,CAAC;QACnG,MAAM,oBAAoB,GAAG,MAAM,CAAC,oBAAoB;YACtD,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,oBAAoB,EAAE,GAAG,MAAM,CAAC,IAAI,wBAAwB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACzG,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,gBAAgB,IAAI,EAAE,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC;YAC7G,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,EAAE,CAAC,CAAC;YACxF,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,oBAAoB,IAAI,EAAE,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC;YAC/G,MAAM,QAAQ,GAAG,MAAM,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;YACxD,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,UAAU,CAAC;mBAC7H,CAAC,QAAQ,CAAC,QAAQ,KAAK,SAAS,IAAI,OAAO,QAAQ,CAAC,QAAQ,KAAK,SAAS,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,GAAG,CAAC,CAAC;QAC1I,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,UAAU,MAAM,aAAa,EAAE,MAAM,EAAE,UAAU,MAAM,WAAW,EAAE,EAAE,EAAE,iBAAiB,CAAqC,CAAC;QACxL,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACpD,IAAI,GAAG,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,EAAE,CAAC,CAAC;YAC5F,IAAI,GAAG,KAAK,GAAG;gBAAE,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,IAAI,0BAA0B,CAAC,CAAC;QAC7E,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAC3H,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACnC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,cAAc,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;eAClH,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;eAC9F,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,MAAM,GAAG,CAAC,IAAI,IAAI,KAAK,QAAQ,MAAM,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACpJ,MAAM,IAAI,KAAK,CAAC,6EAA6E,CAAC,CAAC;QACjG,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC;QAC7B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC9J,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5L,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;QACjE,IAAI,OAAO,WAAW,KAAK,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QACrF,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC;QAC/C,IAAI,OAAO,KAAK,SAAS;YAAE,YAAY,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QACpE,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,IAAI,OAAO,MAAM,CAAC,WAAW,KAAK,SAAS;eAC1E,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;YAC5H,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACnD,CAAC;QACD,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,QAAQ,GAAuB;YACnC,GAAG,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW;YACpE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY;YAC7E,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzD,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjF,GAAG,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,MAAM,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7F,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAiC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChF,GAAG,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChF,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzF,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SACvI,CAAC;QACF,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,QAAQ,KAAK,QAAQ,CAAC,IAAI,EAAE,IAAI,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YACzO,MAAM,IAAI,KAAK,CAAC,qCAAqC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC,CAAC;IAC5J,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC/E,OAAO,EAAE,aAAa,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;AAChD,CAAC,CAAC"}
|
package/dist_ts/index.d.ts
CHANGED
package/dist_ts/index.js
CHANGED
|
@@ -5,6 +5,18 @@ export * from './classes.tspublish.js';
|
|
|
5
5
|
export const runCli = async () => {
|
|
6
6
|
logStart('tspublish');
|
|
7
7
|
const tspublish = new TsPublish();
|
|
8
|
-
|
|
8
|
+
const args = process.argv.slice(2);
|
|
9
|
+
if (args[0] === 'plan' && args.length === 1) {
|
|
10
|
+
console.log(JSON.stringify(await tspublish.plan(paths.cwd), null, 2));
|
|
11
|
+
}
|
|
12
|
+
else if (args[0] === 'prepare' && args.length === 2) {
|
|
13
|
+
console.log(JSON.stringify(await tspublish.prepare(paths.cwd, args[1]), null, 2));
|
|
14
|
+
}
|
|
15
|
+
else if (args.length === 0) {
|
|
16
|
+
await tspublish.publish(paths.cwd);
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
throw new Error('Usage: tspublish [plan | prepare <new-output-directory>]');
|
|
20
|
+
}
|
|
9
21
|
};
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssS0FBSyxNQUFNLFlBQVksQ0FBQztBQUNwQyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUV4QyxjQUFjLHdCQUF3QixDQUFDO0FBR3ZDLE1BQU0sQ0FBQyxNQUFNLE1BQU0sR0FBRyxLQUFLLElBQUksRUFBRTtJQUMvQixRQUFRLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDdEIsTUFBTSxTQUFTLEdBQUcsSUFBSSxTQUFTLEVBQUUsQ0FBQztJQUNsQyxNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNuQyxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxNQUFNLElBQUksSUFBSSxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUM1QyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxTQUFTLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN4RSxDQUFDO1NBQU0sSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssU0FBUyxJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7UUFDdEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sU0FBUyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3BGLENBQUM7U0FBTSxJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7UUFDN0IsTUFBTSxTQUFTLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNyQyxDQUFDO1NBQU0sQ0FBQztRQUNOLE1BQU0sSUFBSSxLQUFLLENBQUMsMERBQTBELENBQUMsQ0FBQztJQUM5RSxDQUFDO0FBQ0gsQ0FBQyxDQUFDIn0=
|
|
@@ -10,4 +10,60 @@ export interface ITsPublishJson {
|
|
|
10
10
|
* allows the sepcification of bin names that invoke cli scripts
|
|
11
11
|
*/
|
|
12
12
|
bin: string[];
|
|
13
|
+
description?: string;
|
|
14
|
+
/** Additional source folders owned by this package, for example subpath exports. */
|
|
15
|
+
folders?: string[];
|
|
16
|
+
exports?: Record<string, TTsPublishExport>;
|
|
17
|
+
peerDependencies?: Record<string, string>;
|
|
18
|
+
peerDependenciesMeta?: Record<string, {
|
|
19
|
+
optional?: boolean;
|
|
20
|
+
}>;
|
|
21
|
+
optionalDependencies?: string[];
|
|
22
|
+
engines?: Record<string, string>;
|
|
23
|
+
sideEffects?: boolean | string[];
|
|
24
|
+
/** Explicit repository-relative asset files/directories to include unchanged. */
|
|
25
|
+
include?: string[];
|
|
26
|
+
}
|
|
27
|
+
export type TTsPublishExport = string | null | {
|
|
28
|
+
[condition: string]: TTsPublishExport;
|
|
29
|
+
};
|
|
30
|
+
export interface ITsPublishManifest {
|
|
31
|
+
name: string;
|
|
32
|
+
version: string;
|
|
33
|
+
type: 'module';
|
|
34
|
+
description: string;
|
|
35
|
+
main?: string;
|
|
36
|
+
types?: string;
|
|
37
|
+
exports: Record<string, TTsPublishExport>;
|
|
38
|
+
dependencies: Record<string, string>;
|
|
39
|
+
optionalDependencies?: Record<string, string>;
|
|
40
|
+
peerDependencies?: Record<string, string>;
|
|
41
|
+
peerDependenciesMeta?: Record<string, {
|
|
42
|
+
optional?: boolean;
|
|
43
|
+
}>;
|
|
44
|
+
engines?: Record<string, string>;
|
|
45
|
+
sideEffects?: boolean | string[];
|
|
46
|
+
bin?: Record<string, string>;
|
|
47
|
+
files: string[];
|
|
48
|
+
[key: string]: unknown;
|
|
49
|
+
}
|
|
50
|
+
export interface ITsPublishModulePlan {
|
|
51
|
+
folder: string;
|
|
52
|
+
folders: string[];
|
|
53
|
+
name: string;
|
|
54
|
+
version: string;
|
|
55
|
+
/** Position in the deterministic dependency order. */
|
|
56
|
+
order: number;
|
|
57
|
+
manifest: ITsPublishManifest;
|
|
58
|
+
include: string[];
|
|
59
|
+
licenseFile: string;
|
|
60
|
+
registries: string[];
|
|
61
|
+
}
|
|
62
|
+
export interface ITsPublishPlan {
|
|
63
|
+
schemaVersion: 1;
|
|
64
|
+
version: string;
|
|
65
|
+
modules: ITsPublishModulePlan[];
|
|
66
|
+
}
|
|
67
|
+
export interface ITsPublishPreparedModule extends ITsPublishModulePlan {
|
|
68
|
+
directory: string;
|
|
13
69
|
}
|
package/dist_ts/plugins.d.ts
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
|
-
import * as path from 'path';
|
|
2
|
-
|
|
1
|
+
import * as path from 'node:path';
|
|
2
|
+
import * as fs from 'node:fs/promises';
|
|
3
|
+
import { isBuiltin } from 'node:module';
|
|
4
|
+
import * as typescript from 'typescript';
|
|
5
|
+
export { path, fs, isBuiltin, typescript };
|
|
3
6
|
import * as consolecolor from '@push.rocks/consolecolor';
|
|
4
7
|
import * as smartconfig from '@push.rocks/smartconfig';
|
|
5
8
|
import * as smartfile from '@push.rocks/smartfile';
|
package/dist_ts/plugins.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
// node native scope
|
|
2
|
-
import * as path from 'path';
|
|
3
|
-
|
|
2
|
+
import * as path from 'node:path';
|
|
3
|
+
import * as fs from 'node:fs/promises';
|
|
4
|
+
import { isBuiltin } from 'node:module';
|
|
5
|
+
import * as typescript from 'typescript';
|
|
6
|
+
export { path, fs, isBuiltin, typescript };
|
|
4
7
|
// @push.rocks scope
|
|
5
8
|
import * as consolecolor from '@push.rocks/consolecolor';
|
|
6
9
|
import * as smartconfig from '@push.rocks/smartconfig';
|
|
@@ -16,4 +19,4 @@ import * as smartshell from '@push.rocks/smartshell';
|
|
|
16
19
|
// Create a pre-configured SmartFs instance for Node.js filesystem operations
|
|
17
20
|
const smartfs = new SmartFs(new SmartFsProviderNode());
|
|
18
21
|
export { consolecolor, smartconfig, smartfile, smartfs, smartcli, smartdelay, smartlog, smartnpm, smartpath, smartrequest, smartshell };
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxJQUFJLE1BQU0sV0FBVyxDQUFDO0FBQ2xDLE9BQU8sS0FBSyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDdkMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN4QyxPQUFPLEtBQUssVUFBVSxNQUFNLFlBQVksQ0FBQztBQUN6QyxPQUFPLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFFLENBQUM7QUFFM0Msb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxZQUFZLE1BQU0sMEJBQTBCLENBQUM7QUFDekQsT0FBTyxLQUFLLFdBQVcsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssU0FBUyxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNuRSxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxVQUFVLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssVUFBVSxNQUFNLHdCQUF3QixDQUFDO0FBRXJELDZFQUE2RTtBQUM3RSxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxJQUFJLG1CQUFtQixFQUFFLENBQUMsQ0FBQztBQUV2RCxPQUFPLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLFVBQVUsRUFBRSxDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/tspublish",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.12.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A tool to publish multiple, concise, and small packages from monorepos, specifically for TypeScript projects within a git environment.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -8,20 +8,15 @@
|
|
|
8
8
|
"type": "module",
|
|
9
9
|
"author": "Task Venture Capital GmbH",
|
|
10
10
|
"license": "MIT",
|
|
11
|
-
"scripts": {
|
|
12
|
-
"test": "(tstest test/ --verbose --testlog --timeout 30)",
|
|
13
|
-
"build": "(tsbuild --web)",
|
|
14
|
-
"buildDocs": "(tsdoc)"
|
|
15
|
-
},
|
|
16
11
|
"bin": {
|
|
17
12
|
"tspublish": "./cli.js"
|
|
18
13
|
},
|
|
19
14
|
"devDependencies": {
|
|
20
|
-
"@git.zone/tsbuild": "^4.4.
|
|
21
|
-
"@git.zone/tsbundle": "^2.
|
|
22
|
-
"@git.zone/tsrun": "^2.0.
|
|
23
|
-
"@git.zone/tstest": "^
|
|
24
|
-
"@types/node": "
|
|
15
|
+
"@git.zone/tsbuild": "^4.4.2",
|
|
16
|
+
"@git.zone/tsbundle": "^2.13.0",
|
|
17
|
+
"@git.zone/tsrun": "^2.0.6",
|
|
18
|
+
"@git.zone/tstest": "^4.0.0",
|
|
19
|
+
"@types/node": "26.4.0"
|
|
25
20
|
},
|
|
26
21
|
"repository": {
|
|
27
22
|
"type": "git",
|
|
@@ -44,20 +39,22 @@
|
|
|
44
39
|
"assets/**/*",
|
|
45
40
|
"cli.js",
|
|
46
41
|
".smartconfig.json",
|
|
42
|
+
"license.md",
|
|
47
43
|
"readme.md"
|
|
48
44
|
],
|
|
49
45
|
"dependencies": {
|
|
50
|
-
"@push.rocks/consolecolor": "^2.0.
|
|
51
|
-
"@push.rocks/smartcli": "^4.0.
|
|
52
|
-
"@push.rocks/smartconfig": "^6.
|
|
53
|
-
"@push.rocks/smartdelay": "^3.0
|
|
54
|
-
"@push.rocks/smartfile": "^13.1.
|
|
55
|
-
"@push.rocks/smartfs": "^1.5.
|
|
56
|
-
"@push.rocks/smartlog": "^3.2.
|
|
57
|
-
"@push.rocks/smartnpm": "^2.0
|
|
46
|
+
"@push.rocks/consolecolor": "^2.0.4",
|
|
47
|
+
"@push.rocks/smartcli": "^4.0.21",
|
|
48
|
+
"@push.rocks/smartconfig": "^6.1.1",
|
|
49
|
+
"@push.rocks/smartdelay": "^3.1.0",
|
|
50
|
+
"@push.rocks/smartfile": "^13.1.3",
|
|
51
|
+
"@push.rocks/smartfs": "^1.5.1",
|
|
52
|
+
"@push.rocks/smartlog": "^3.2.2",
|
|
53
|
+
"@push.rocks/smartnpm": "^2.1.0",
|
|
58
54
|
"@push.rocks/smartpath": "^6.0.0",
|
|
59
|
-
"@push.rocks/smartrequest": "^5.0.
|
|
60
|
-
"@push.rocks/smartshell": "^3.3.8"
|
|
55
|
+
"@push.rocks/smartrequest": "^5.0.3",
|
|
56
|
+
"@push.rocks/smartshell": "^3.3.8",
|
|
57
|
+
"typescript": "^6.0.3"
|
|
61
58
|
},
|
|
62
59
|
"keywords": [
|
|
63
60
|
"typescript",
|
|
@@ -71,5 +68,9 @@
|
|
|
71
68
|
"module-management",
|
|
72
69
|
"developer-tools"
|
|
73
70
|
],
|
|
74
|
-
"
|
|
75
|
-
|
|
71
|
+
"scripts": {
|
|
72
|
+
"test": "(tstest test/ --verbose --logfile --timeout 30)",
|
|
73
|
+
"build": "(tsbuild --web)",
|
|
74
|
+
"buildDocs": "(tsdoc)"
|
|
75
|
+
}
|
|
76
|
+
}
|