@git.zone/cli 8.2.3 → 8.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/helpers.ownerscopes.d.ts +19 -0
- package/dist_ts/helpers.ownerscopes.js +81 -0
- package/dist_ts/index.d.ts +1 -0
- package/dist_ts/index.js +2 -1
- package/dist_ts/mod_format/formatters/deno.formatter.d.ts +18 -0
- package/dist_ts/mod_format/formatters/deno.formatter.js +175 -0
- package/dist_ts/mod_format/index.js +4 -1
- package/dist_ts/mod_format/interfaces.format.js +2 -1
- package/package.json +1 -1
- package/readme.md +24 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/helpers.ownerscopes.ts +81 -0
- package/ts/index.ts +2 -0
- package/ts/mod_format/formatters/deno.formatter.ts +219 -0
- package/ts/mod_format/index.ts +3 -0
- package/ts/mod_format/interfaces.format.ts +1 -0
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/cli',
|
|
6
|
-
version: '8.
|
|
6
|
+
version: '8.3.0',
|
|
7
7
|
description: 'A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxlQUFlO0lBQ3JCLE9BQU8sRUFBRSxPQUFPO0lBQ2hCLFdBQVcsRUFBRSwrTEFBK0w7Q0FDN00sQ0FBQSJ9
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The npm scopes the owner publishes under. A release-age rule (pnpm
|
|
3
|
+
* `minimumReleaseAge`, Deno `minimumDependencyAge`) holds back freshly
|
|
4
|
+
* published third-party versions; it must never hold back our own packages,
|
|
5
|
+
* which are consumed right after their release.
|
|
6
|
+
*
|
|
7
|
+
* This list is the single source for those exemptions. `gitzone format`
|
|
8
|
+
* writes it into the root `deno.json` as `minimumDependencyAge.exclude`
|
|
9
|
+
* (`npm:<scope>/*` per scope), so no repository keeps a hand-copied list.
|
|
10
|
+
*/
|
|
11
|
+
export declare const ownerNpmScopes: readonly ["@api.global", "@apiclient.xyz", "@apiglobal_private", "@bellini.io", "@bellini_private", "@cardanotech", "@central.eu", "@coffee.link", "@coffee.link_private", "@configvault.io", "@consent.software", "@consentsoftware", "@consentsoftware_private", "@design.estate", "@designestate", "@doclake", "@ecobridge", "@ecobridge.xyz", "@fin.cx", "@foss.global", "@freelance-club", "@freelance.club_private", "@git.zone", "@homebridgelink", "@host.today", "@idp.global", "@in.work", "@lossless", "@lossless.org", "@losslessdirectory_private", "@lossless.zone", "@losslessone_private", "@losslessone_websites", "@maintainable.xyz", "@modelgrid.com", "@modelprofile.com", "@mojoio", "@nevermind.finance", "@onboard.me", "@playcontrol", "@playcontrol_private", "@push.rocks", "@serve.zone", "@servezone_private", "@ship.zone", "@shipzone", "@signature.digital", "@signup.software", "@signup.software_private", "@smarthome.exchange", "@social.io", "@social.io_private", "@stack.gallery", "@start.plus", "@tempfix", "@tsclass", "@uptime.link", "@uptime.link_private", "@uptimelink_private", "@workspace.global_private"];
|
|
12
|
+
/**
|
|
13
|
+
* The minimum dependency age `gitzone format` writes into a root `deno.json`
|
|
14
|
+
* that sets none (a missing or `null` age): 7 days, as an ISO 8601 duration.
|
|
15
|
+
* It mirrors the owner's pnpm `minimumReleaseAge` of 10080 minutes, so
|
|
16
|
+
* third-party packages wait as long under Deno as under pnpm. An age a project
|
|
17
|
+
* already sets is never changed.
|
|
18
|
+
*/
|
|
19
|
+
export declare const ownerMinimumDependencyAge = "P7D";
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The npm scopes the owner publishes under. A release-age rule (pnpm
|
|
3
|
+
* `minimumReleaseAge`, Deno `minimumDependencyAge`) holds back freshly
|
|
4
|
+
* published third-party versions; it must never hold back our own packages,
|
|
5
|
+
* which are consumed right after their release.
|
|
6
|
+
*
|
|
7
|
+
* This list is the single source for those exemptions. `gitzone format`
|
|
8
|
+
* writes it into the root `deno.json` as `minimumDependencyAge.exclude`
|
|
9
|
+
* (`npm:<scope>/*` per scope), so no repository keeps a hand-copied list.
|
|
10
|
+
*/
|
|
11
|
+
export const ownerNpmScopes = [
|
|
12
|
+
'@api.global',
|
|
13
|
+
'@apiclient.xyz',
|
|
14
|
+
'@apiglobal_private',
|
|
15
|
+
'@bellini.io',
|
|
16
|
+
'@bellini_private',
|
|
17
|
+
'@cardanotech',
|
|
18
|
+
'@central.eu',
|
|
19
|
+
'@coffee.link',
|
|
20
|
+
'@coffee.link_private',
|
|
21
|
+
'@configvault.io',
|
|
22
|
+
'@consent.software',
|
|
23
|
+
'@consentsoftware',
|
|
24
|
+
'@consentsoftware_private',
|
|
25
|
+
'@design.estate',
|
|
26
|
+
'@designestate',
|
|
27
|
+
'@doclake',
|
|
28
|
+
'@ecobridge',
|
|
29
|
+
'@ecobridge.xyz',
|
|
30
|
+
'@fin.cx',
|
|
31
|
+
'@foss.global',
|
|
32
|
+
'@freelance-club',
|
|
33
|
+
'@freelance.club_private',
|
|
34
|
+
'@git.zone',
|
|
35
|
+
'@homebridgelink',
|
|
36
|
+
'@host.today',
|
|
37
|
+
'@idp.global',
|
|
38
|
+
'@in.work',
|
|
39
|
+
'@lossless',
|
|
40
|
+
'@lossless.org',
|
|
41
|
+
'@losslessdirectory_private',
|
|
42
|
+
'@lossless.zone',
|
|
43
|
+
'@losslessone_private',
|
|
44
|
+
'@losslessone_websites',
|
|
45
|
+
'@maintainable.xyz',
|
|
46
|
+
'@modelgrid.com',
|
|
47
|
+
'@modelprofile.com',
|
|
48
|
+
'@mojoio',
|
|
49
|
+
'@nevermind.finance',
|
|
50
|
+
'@onboard.me',
|
|
51
|
+
'@playcontrol',
|
|
52
|
+
'@playcontrol_private',
|
|
53
|
+
'@push.rocks',
|
|
54
|
+
'@serve.zone',
|
|
55
|
+
'@servezone_private',
|
|
56
|
+
'@ship.zone',
|
|
57
|
+
'@shipzone',
|
|
58
|
+
'@signature.digital',
|
|
59
|
+
'@signup.software',
|
|
60
|
+
'@signup.software_private',
|
|
61
|
+
'@smarthome.exchange',
|
|
62
|
+
'@social.io',
|
|
63
|
+
'@social.io_private',
|
|
64
|
+
'@stack.gallery',
|
|
65
|
+
'@start.plus',
|
|
66
|
+
'@tempfix',
|
|
67
|
+
'@tsclass',
|
|
68
|
+
'@uptime.link',
|
|
69
|
+
'@uptime.link_private',
|
|
70
|
+
'@uptimelink_private',
|
|
71
|
+
'@workspace.global_private',
|
|
72
|
+
];
|
|
73
|
+
/**
|
|
74
|
+
* The minimum dependency age `gitzone format` writes into a root `deno.json`
|
|
75
|
+
* that sets none (a missing or `null` age): 7 days, as an ISO 8601 duration.
|
|
76
|
+
* It mirrors the owner's pnpm `minimumReleaseAge` of 10080 minutes, so
|
|
77
|
+
* third-party packages wait as long under Deno as under pnpm. An age a project
|
|
78
|
+
* already sets is never changed.
|
|
79
|
+
*/
|
|
80
|
+
export const ownerMinimumDependencyAge = 'P7D';
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5vd25lcnNjb3Blcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2hlbHBlcnMub3duZXJzY29wZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7OztHQVNHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sY0FBYyxHQUFHO0lBQzVCLGFBQWE7SUFDYixnQkFBZ0I7SUFDaEIsb0JBQW9CO0lBQ3BCLGFBQWE7SUFDYixrQkFBa0I7SUFDbEIsY0FBYztJQUNkLGFBQWE7SUFDYixjQUFjO0lBQ2Qsc0JBQXNCO0lBQ3RCLGlCQUFpQjtJQUNqQixtQkFBbUI7SUFDbkIsa0JBQWtCO0lBQ2xCLDBCQUEwQjtJQUMxQixnQkFBZ0I7SUFDaEIsZUFBZTtJQUNmLFVBQVU7SUFDVixZQUFZO0lBQ1osZ0JBQWdCO0lBQ2hCLFNBQVM7SUFDVCxjQUFjO0lBQ2QsaUJBQWlCO0lBQ2pCLHlCQUF5QjtJQUN6QixXQUFXO0lBQ1gsaUJBQWlCO0lBQ2pCLGFBQWE7SUFDYixhQUFhO0lBQ2IsVUFBVTtJQUNWLFdBQVc7SUFDWCxlQUFlO0lBQ2YsNEJBQTRCO0lBQzVCLGdCQUFnQjtJQUNoQixzQkFBc0I7SUFDdEIsdUJBQXVCO0lBQ3ZCLG1CQUFtQjtJQUNuQixnQkFBZ0I7SUFDaEIsbUJBQW1CO0lBQ25CLFNBQVM7SUFDVCxvQkFBb0I7SUFDcEIsYUFBYTtJQUNiLGNBQWM7SUFDZCxzQkFBc0I7SUFDdEIsYUFBYTtJQUNiLGFBQWE7SUFDYixvQkFBb0I7SUFDcEIsWUFBWTtJQUNaLFdBQVc7SUFDWCxvQkFBb0I7SUFDcEIsa0JBQWtCO0lBQ2xCLDBCQUEwQjtJQUMxQixxQkFBcUI7SUFDckIsWUFBWTtJQUNaLG9CQUFvQjtJQUNwQixnQkFBZ0I7SUFDaEIsYUFBYTtJQUNiLFVBQVU7SUFDVixVQUFVO0lBQ1YsY0FBYztJQUNkLHNCQUFzQjtJQUN0QixxQkFBcUI7SUFDckIsMkJBQTJCO0NBQ25CLENBQUM7QUFFWDs7Ozs7O0dBTUc7QUFDSCxNQUFNLENBQUMsTUFBTSx5QkFBeUIsR0FBRyxLQUFLLENBQUMifQ==
|
package/dist_ts/index.d.ts
CHANGED
package/dist_ts/index.js
CHANGED
|
@@ -7,4 +7,5 @@ export const runCli = async () => {
|
|
|
7
7
|
gitzoneCli.run();
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
-
|
|
10
|
+
export { ownerMinimumDependencyAge, ownerNpmScopes } from './helpers.ownerscopes.js';
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLENBQUMsTUFBTSxNQUFNLEdBQUcsS0FBSyxJQUFJLEVBQUU7SUFDL0IsTUFBTSxLQUFLLEdBQUcsTUFBTSxNQUFNLENBQUMsbUJBQW1CLENBQUMsQ0FBQztJQUNoRCxLQUFLLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3ZCLE1BQU0sT0FBTyxHQUFHLE1BQU0sTUFBTSxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQzdDLE1BQU0sVUFBVSxHQUFHLE1BQU0sTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUM7SUFDcEQsS0FBSyxDQUFDLElBQUksRUFBRSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUU7UUFDckIsVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQ25CLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBRUYsT0FBTyxFQUFFLHlCQUF5QixFQUFFLGNBQWMsRUFBRSxNQUFNLDBCQUEwQixDQUFDIn0=
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { BaseFormatter } from '../classes.baseformatter.js';
|
|
2
|
+
import type { IFormatWarning, IPlannedChange } from '../interfaces.format.js';
|
|
3
|
+
/** The `minimumDependencyAge.exclude` entries that exempt every package of the owner scopes. */
|
|
4
|
+
export declare const ownerDependencyAgeExcludes: readonly string[];
|
|
5
|
+
/**
|
|
6
|
+
* Keeps Deno's minimum dependency age from holding back the owner's own packages: the root
|
|
7
|
+
* deno.json(c) of a Deno project gets `npm:<scope>/*` in `minimumDependencyAge.exclude` for every
|
|
8
|
+
* owner scope, and the owner's age when it sets none. Deno reads the setting from the workspace
|
|
9
|
+
* root only, so members are never written; a member that sets it is reported. Files that are
|
|
10
|
+
* not plain JSON are reported instead of rewritten, so their comments are never dropped.
|
|
11
|
+
*/
|
|
12
|
+
export declare class DenoFormatter extends BaseFormatter {
|
|
13
|
+
get name(): string;
|
|
14
|
+
analyze(): Promise<IPlannedChange[]>;
|
|
15
|
+
validate(): Promise<IFormatWarning[]>;
|
|
16
|
+
applyChange(change: IPlannedChange): Promise<void>;
|
|
17
|
+
private inspect;
|
|
18
|
+
}
|
|
@@ -0,0 +1,175 @@
|
|
|
1
|
+
import { BaseFormatter } from '../classes.baseformatter.js';
|
|
2
|
+
import * as plugins from '../mod.plugins.js';
|
|
3
|
+
import { logger } from '../../gitzone.logging.js';
|
|
4
|
+
import { ownerMinimumDependencyAge, ownerNpmScopes } from '../../helpers.ownerscopes.js';
|
|
5
|
+
/** The config files Deno loads from a directory: deno.json, else deno.jsonc. */
|
|
6
|
+
const denoConfigNames = ['deno.json', 'deno.jsonc'];
|
|
7
|
+
/** The `minimumDependencyAge.exclude` entries that exempt every package of the owner scopes. */
|
|
8
|
+
export const ownerDependencyAgeExcludes = ownerNpmScopes.map((scopeArg) => `npm:${scopeArg}/*`);
|
|
9
|
+
const isPlainObject = (valueArg) => valueArg !== null && typeof valueArg === 'object' && !Array.isArray(valueArg);
|
|
10
|
+
const readDenoConfig = async (dirArg) => {
|
|
11
|
+
for (const name of denoConfigNames) {
|
|
12
|
+
const path = plugins.path.join(dirArg, name);
|
|
13
|
+
if (!(await plugins.smartfs.file(path).exists())) {
|
|
14
|
+
continue;
|
|
15
|
+
}
|
|
16
|
+
const content = (await plugins.smartfs.file(path).encoding('utf8').read());
|
|
17
|
+
try {
|
|
18
|
+
const parsed = JSON.parse(content);
|
|
19
|
+
return isPlainObject(parsed)
|
|
20
|
+
? { path, content, config: parsed }
|
|
21
|
+
: { path, content, problem: 'it does not hold a JSON object' };
|
|
22
|
+
}
|
|
23
|
+
catch (error) {
|
|
24
|
+
return { path, content, problem: error instanceof Error ? error.message : String(error) };
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return undefined;
|
|
28
|
+
};
|
|
29
|
+
/** The member list of a deno.json `workspace` (a list, or `{ "members": [...] }`); undefined without one. */
|
|
30
|
+
const workspaceMembers = (configArg) => {
|
|
31
|
+
const workspace = configArg.workspace;
|
|
32
|
+
const members = isPlainObject(workspace) ? workspace.members : workspace;
|
|
33
|
+
return Array.isArray(members)
|
|
34
|
+
? members.filter((memberArg) => typeof memberArg === 'string')
|
|
35
|
+
: undefined;
|
|
36
|
+
};
|
|
37
|
+
/**
|
|
38
|
+
* The absolute directories of the workspace members that carry a Deno config file. Members are
|
|
39
|
+
* paths or glob patterns relative to the root; a `!` entry removes the members it matches.
|
|
40
|
+
*/
|
|
41
|
+
const workspaceMemberDirs = async (rootDirArg, membersArg) => {
|
|
42
|
+
const included = new Set();
|
|
43
|
+
const excluded = new Set();
|
|
44
|
+
for (const member of membersArg) {
|
|
45
|
+
const negated = member.startsWith('!');
|
|
46
|
+
const pattern = (negated ? member.slice(1) : member).replace(/\/+$/, '');
|
|
47
|
+
for (const name of denoConfigNames) {
|
|
48
|
+
for await (const match of plugins.fs.glob(`${pattern}/${name}`, { cwd: rootDirArg })) {
|
|
49
|
+
(negated ? excluded : included).add(plugins.path.dirname(plugins.path.resolve(rootDirArg, match)));
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
return [...included].filter((dirArg) => !excluded.has(dirArg)).sort();
|
|
54
|
+
};
|
|
55
|
+
/** The deno config of the nearest enclosing workspace that lists `dirArg` as a member. */
|
|
56
|
+
const findEnclosingWorkspace = async (dirArg) => {
|
|
57
|
+
for (let dir = plugins.path.dirname(dirArg);; dir = plugins.path.dirname(dir)) {
|
|
58
|
+
const file = await readDenoConfig(dir);
|
|
59
|
+
const members = file?.config ? workspaceMembers(file.config) : undefined;
|
|
60
|
+
if (file && members) {
|
|
61
|
+
return (await workspaceMemberDirs(dir, members)).includes(dirArg) ? file.path : undefined;
|
|
62
|
+
}
|
|
63
|
+
if (plugins.path.dirname(dir) === dir) {
|
|
64
|
+
return undefined;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
};
|
|
68
|
+
/**
|
|
69
|
+
* `minimumDependencyAge` as `{ age, exclude }` with every owner scope excluded. An age the project
|
|
70
|
+
* sets (a scalar or `age`, `false` and `0` included) is kept; a missing or `null` one becomes
|
|
71
|
+
* `ownerMinimumDependencyAge`. Project-specific exclusions are kept, deduplicated and sorted.
|
|
72
|
+
*/
|
|
73
|
+
const withOwnerExcludes = (currentArg) => {
|
|
74
|
+
const build = (ageArg, excludeArg, restArg = {}) => {
|
|
75
|
+
if (!Array.isArray(excludeArg) || excludeArg.some((entryArg) => typeof entryArg !== 'string')) {
|
|
76
|
+
return { problem: 'minimumDependencyAge.exclude is not a list of strings' };
|
|
77
|
+
}
|
|
78
|
+
return {
|
|
79
|
+
value: {
|
|
80
|
+
age: ageArg ?? ownerMinimumDependencyAge,
|
|
81
|
+
exclude: [...new Set([...excludeArg, ...ownerDependencyAgeExcludes])].sort(),
|
|
82
|
+
...restArg,
|
|
83
|
+
},
|
|
84
|
+
};
|
|
85
|
+
};
|
|
86
|
+
if (currentArg === undefined || currentArg === null) {
|
|
87
|
+
return build(undefined, []);
|
|
88
|
+
}
|
|
89
|
+
if (typeof currentArg === 'string' || typeof currentArg === 'number' || currentArg === false) {
|
|
90
|
+
return build(currentArg, []);
|
|
91
|
+
}
|
|
92
|
+
if (isPlainObject(currentArg)) {
|
|
93
|
+
const { age, exclude, ...rest } = currentArg;
|
|
94
|
+
return build(age, exclude ?? [], rest);
|
|
95
|
+
}
|
|
96
|
+
return { problem: 'minimumDependencyAge is neither an age nor { "age", "exclude" }' };
|
|
97
|
+
};
|
|
98
|
+
/**
|
|
99
|
+
* Keeps Deno's minimum dependency age from holding back the owner's own packages: the root
|
|
100
|
+
* deno.json(c) of a Deno project gets `npm:<scope>/*` in `minimumDependencyAge.exclude` for every
|
|
101
|
+
* owner scope, and the owner's age when it sets none. Deno reads the setting from the workspace
|
|
102
|
+
* root only, so members are never written; a member that sets it is reported. Files that are
|
|
103
|
+
* not plain JSON are reported instead of rewritten, so their comments are never dropped.
|
|
104
|
+
*/
|
|
105
|
+
export class DenoFormatter extends BaseFormatter {
|
|
106
|
+
get name() {
|
|
107
|
+
return 'deno';
|
|
108
|
+
}
|
|
109
|
+
async analyze() {
|
|
110
|
+
return (await this.inspect()).changes;
|
|
111
|
+
}
|
|
112
|
+
async validate() {
|
|
113
|
+
return (await this.inspect()).warnings;
|
|
114
|
+
}
|
|
115
|
+
async applyChange(change) {
|
|
116
|
+
if (change.type !== 'modify' || !change.content)
|
|
117
|
+
return;
|
|
118
|
+
await this.modifyFile(change.path, change.content);
|
|
119
|
+
logger.log('info', `Updated minimumDependencyAge in ${change.path}`);
|
|
120
|
+
}
|
|
121
|
+
async inspect() {
|
|
122
|
+
const inspection = { changes: [], warnings: [] };
|
|
123
|
+
const warn = (levelArg, messageArg) => inspection.warnings.push({ level: levelArg, module: this.name, message: messageArg });
|
|
124
|
+
const file = await readDenoConfig('.');
|
|
125
|
+
if (!file) {
|
|
126
|
+
return inspection;
|
|
127
|
+
}
|
|
128
|
+
if (!file.config) {
|
|
129
|
+
warn('error', `${file.path} is not plain JSON (${file.problem}). gitzone format edits plain JSON only so it never drops comments; make it plain JSON, or add the owner scopes to minimumDependencyAge.exclude by hand.`);
|
|
130
|
+
return inspection;
|
|
131
|
+
}
|
|
132
|
+
const cwd = process.cwd();
|
|
133
|
+
const members = workspaceMembers(file.config);
|
|
134
|
+
if (!members) {
|
|
135
|
+
const workspaceRoot = await findEnclosingWorkspace(cwd);
|
|
136
|
+
if (workspaceRoot) {
|
|
137
|
+
warn(Object.hasOwn(file.config, 'minimumDependencyAge') ? 'warning' : 'info', `${file.path} is a member of the Deno workspace at ${workspaceRoot}, which holds minimumDependencyAge; Deno ignores the setting in a member.`);
|
|
138
|
+
return inspection;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
for (const memberDir of await workspaceMemberDirs(cwd, members ?? [])) {
|
|
142
|
+
const memberFile = await readDenoConfig(memberDir);
|
|
143
|
+
if (!memberFile) {
|
|
144
|
+
continue; // removed since the workspace was listed
|
|
145
|
+
}
|
|
146
|
+
const memberPath = plugins.path.relative(cwd, memberFile.path);
|
|
147
|
+
if (!memberFile.config) {
|
|
148
|
+
warn('warning', `Cannot read the workspace member ${memberPath} as plain JSON (${memberFile.problem}).`);
|
|
149
|
+
}
|
|
150
|
+
else if (Object.hasOwn(memberFile.config, 'minimumDependencyAge')) {
|
|
151
|
+
warn('warning', `The workspace member ${memberPath} sets minimumDependencyAge, which Deno ignores outside the workspace root; remove it there, ${file.path} applies.`);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
const current = file.config.minimumDependencyAge;
|
|
155
|
+
const merged = withOwnerExcludes(current);
|
|
156
|
+
if ('problem' in merged) {
|
|
157
|
+
warn('error', `${file.path}: ${merged.problem}.`);
|
|
158
|
+
return inspection;
|
|
159
|
+
}
|
|
160
|
+
if (JSON.stringify(merged.value) === JSON.stringify(current)) {
|
|
161
|
+
return inspection;
|
|
162
|
+
}
|
|
163
|
+
const indent = /\n([ \t]+)"/.exec(file.content)?.[1] ?? ' ';
|
|
164
|
+
const updated = { ...file.config, minimumDependencyAge: merged.value };
|
|
165
|
+
inspection.changes.push({
|
|
166
|
+
type: 'modify',
|
|
167
|
+
path: file.path,
|
|
168
|
+
module: this.name,
|
|
169
|
+
description: "Exclude the owner scopes from Deno's minimum dependency age",
|
|
170
|
+
content: `${JSON.stringify(updated, null, indent)}${file.content.endsWith('\n') ? '\n' : ''}`,
|
|
171
|
+
});
|
|
172
|
+
return inspection;
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deno.formatter.js","sourceRoot":"","sources":["../../../../ts/mod_format/formatters/deno.formatter.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ import { TemplatesFormatter } from "./formatters/templates.formatter.js";
|
|
|
15
15
|
import { AssetsFormatter } from "./formatters/assets.formatter.js";
|
|
16
16
|
import { GitignoreFormatter } from "./formatters/gitignore.formatter.js";
|
|
17
17
|
import { TsconfigFormatter } from "./formatters/tsconfig.formatter.js";
|
|
18
|
+
import { DenoFormatter } from "./formatters/deno.formatter.js";
|
|
18
19
|
import { PrettierFormatter } from "./formatters/prettier.formatter.js";
|
|
19
20
|
import { ReadmeFormatter } from "./formatters/readme.formatter.js";
|
|
20
21
|
import { CopyFormatter } from "./formatters/copy.formatter.js";
|
|
@@ -54,6 +55,7 @@ const formatterMap = {
|
|
|
54
55
|
assets: AssetsFormatter,
|
|
55
56
|
gitignore: GitignoreFormatter,
|
|
56
57
|
tsconfig: TsconfigFormatter,
|
|
58
|
+
deno: DenoFormatter,
|
|
57
59
|
prettier: PrettierFormatter,
|
|
58
60
|
readme: ReadmeFormatter,
|
|
59
61
|
copy: CopyFormatter,
|
|
@@ -64,6 +66,7 @@ const formattersNotRequiringProjectType = [
|
|
|
64
66
|
"prettier",
|
|
65
67
|
"cleanup",
|
|
66
68
|
"packagejson",
|
|
69
|
+
"deno",
|
|
67
70
|
];
|
|
68
71
|
const getFormatConfig = async () => {
|
|
69
72
|
const rawFormatConfig = await getCliConfigValue("format", {});
|
|
@@ -568,4 +571,4 @@ export function showHelp(mode) {
|
|
|
568
571
|
console.log(" gitzone format fix");
|
|
569
572
|
console.log("");
|
|
570
573
|
}
|
|
571
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/mod_format/index.ts"],"names":[],"mappings":"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"}
|
|
574
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/mod_format/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ export function getModuleIcon(module) {
|
|
|
3
3
|
packagejson: '📦',
|
|
4
4
|
license: '📝',
|
|
5
5
|
tsconfig: '🔧',
|
|
6
|
+
deno: '🦕',
|
|
6
7
|
cleanup: '🚮',
|
|
7
8
|
gitignore: '🔒',
|
|
8
9
|
prettier: '✨',
|
|
@@ -14,4 +15,4 @@ export function getModuleIcon(module) {
|
|
|
14
15
|
};
|
|
15
16
|
return icons[module] || '📁';
|
|
16
17
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5mb3JtYXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9tb2RfZm9ybWF0L2ludGVyZmFjZXMuZm9ybWF0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQTJDQSxNQUFNLFVBQVUsYUFBYSxDQUFDLE1BQWM7SUFDMUMsTUFBTSxLQUFLLEdBQTJCO1FBQ3BDLFdBQVcsRUFBRSxJQUFJO1FBQ2pCLE9BQU8sRUFBRSxJQUFJO1FBQ2IsUUFBUSxFQUFFLElBQUk7UUFDZCxJQUFJLEVBQUUsSUFBSTtRQUNWLE9BQU8sRUFBRSxJQUFJO1FBQ2IsU0FBUyxFQUFFLElBQUk7UUFDZixRQUFRLEVBQUUsR0FBRztRQUNiLE1BQU0sRUFBRSxJQUFJO1FBQ1osU0FBUyxFQUFFLElBQUk7UUFDZixXQUFXLEVBQUUsSUFBSTtRQUNqQixNQUFNLEVBQUUsSUFBSTtRQUNaLElBQUksRUFBRSxJQUFJO0tBQ1gsQ0FBQztJQUNGLE9BQU8sS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUFJLElBQUksQ0FBQztBQUMvQixDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/cli",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "8.
|
|
4
|
+
"version": "8.3.0",
|
|
5
5
|
"description": "A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
7
7
|
"typings": "dist_ts/index.d.ts",
|
package/readme.md
CHANGED
|
@@ -1228,10 +1228,33 @@ gitzone format --write --yes
|
|
|
1228
1228
|
gitzone format fix
|
|
1229
1229
|
```
|
|
1230
1230
|
|
|
1231
|
-
Formatters include cleanup, smartconfig normalization, dependency license checks, package metadata normalization, template updates, `.gitignore`, TypeScript config, Prettier, README existence checks, and configured copy operations.
|
|
1231
|
+
Formatters include cleanup, smartconfig normalization, dependency license checks, package metadata normalization, template updates, `.gitignore`, TypeScript config, Deno dependency-age exclusions, Prettier, README existence checks, and configured copy operations.
|
|
1232
1232
|
|
|
1233
1233
|
The `packagejson` formatter writes the `files` list of `package.json`. It ships the `ts/` and `ts_web/` sources without their `tsconfig.json`: `@git.zone/tsbuild` reads a folder's compiler options from `<folder>/tsconfig.json`, which extends the root `tsconfig.json`, and the package does not ship the root file. The list therefore ends with `!ts/tsconfig.json` and `!ts_web/tsconfig.json`; pnpm 10 and 12 apply an exclusion only after the entries that include the file.
|
|
1234
1234
|
|
|
1235
|
+
The `deno` formatter keeps Deno's minimum dependency age (24 hours by default since Deno 2.9) from holding back our own freshly published packages. When the project has a root `deno.json` or `deno.jsonc`, it makes `minimumDependencyAge.exclude` contain `npm:<scope>/*` for every owner scope and sets the owner's age when the project sets none (list shortened here):
|
|
1236
|
+
|
|
1237
|
+
```json
|
|
1238
|
+
{
|
|
1239
|
+
"minimumDependencyAge": {
|
|
1240
|
+
"age": "P7D",
|
|
1241
|
+
"exclude": ["npm:@api.global/*", "npm:@git.zone/*", "npm:@push.rocks/*", "npm:zod"]
|
|
1242
|
+
}
|
|
1243
|
+
}
|
|
1244
|
+
```
|
|
1245
|
+
|
|
1246
|
+
The owner scopes and the owner's age are exported constants, so no repository keeps a hand-copied list:
|
|
1247
|
+
|
|
1248
|
+
```typescript
|
|
1249
|
+
import { ownerMinimumDependencyAge, ownerNpmScopes } from '@git.zone/cli';
|
|
1250
|
+
// ownerNpmScopes: ['@api.global', '@apiclient.xyz', ..., '@push.rocks', '@serve.zone', ...]
|
|
1251
|
+
// ownerMinimumDependencyAge: 'P7D'
|
|
1252
|
+
```
|
|
1253
|
+
|
|
1254
|
+
Project-specific entries stay, and the list is deduplicated and sorted. `ownerMinimumDependencyAge` is 7 days and mirrors the owner's pnpm `minimumReleaseAge` of 10080 minutes, so third-party packages wait as long under Deno as under pnpm (Deno's own default is 24 hours). It is written only when the age is missing or `null`; an age the project sets is kept as it is, `false` and `0` included. A scalar `"minimumDependencyAge": "P1D"` becomes `{ "age": "P1D", "exclude": [...] }`, and the object always lists `age` before `exclude`. Deno reads the setting from the workspace root only, so workspace members are never written: a member that sets it is reported as a warning, and a run inside a member plans nothing. A project without a Deno config gets none. A config that is not plain JSON (comments, trailing commas) is reported as an error and left untouched, so its comments are never dropped.
|
|
1255
|
+
|
|
1256
|
+
Tools must never pass `--min-dep-age` or `--minimum-dependency-age` to Deno: the flag replaces the whole setting and discards the exclusions in `deno.json`. `.npmrc` (`min-release-age`) and `NPM_CONFIG_MIN_RELEASE_AGE` set only the age; the exclusions stay in effect.
|
|
1257
|
+
|
|
1235
1258
|
The template formatter owns `.vscode/settings.json` and `.vscode/launch.json` in every project, and the Gitea workflows, CLI entry points and HTML entry files of the project types that declare them. Workflow and entry files are written from the template as a whole. The formatter never creates or changes a `Dockerfile` or `.dockerignore`: they describe the project's own image. `gitzone template service` and `gitzone template website` scaffold a first pnpm-based Dockerfile.
|
|
1236
1259
|
|
|
1237
1260
|
The Gitea workflows verify and never publish. npm and wcc projects get `default_nottags.yaml` and `default_tags.yaml`, service and website projects `docker_nottags.yaml` and `docker_tags.yaml`. Each runs in `code.foss.global/host.today/ht-docker-node:latest`: a pinned checkout that keeps no credentials, then `pnpm --version`, `pnpm install --frozen-lockfile`, `pnpm build`, `pnpm test` and `pnpm audit --prod --audit-level=high --registry=https://registry.npmjs.org`. The audit fails the workflow when a production dependency has a high or critical advisory; development dependencies do not ship and are not audited. It asks registry.npmjs.org because a private registry may not serve the advisory endpoint, and it runs last, so a newly published advisory never hides a test result. pnpm 12 skips an advisory you have reviewed and accepted when `pnpm-workspace.yaml` lists its GHSA ID under `auditConfig.ignoreGhsas`. No setup action installs pnpm: the image's pnpm switches to the version that `package.json` pins in `packageManager`, pnpm 10 included, so the printed version is the one that installs, builds, tests and audits. The switch downloads that version from the npm registry, so the runner needs registry access, which the install needs anyway. They use no secrets and build no images; a tag workflow verifies the tagged commit, and `gitzone release` publishes packages and images. The two `.vscode` files are merged at the top level instead: every key the template declares is refreshed, and every other top-level key — an editor setting only your project has, such as `deno.enable` — is kept. Two limits follow from that. A key the template itself declares is taken as a whole, so an array such as `json.schemas` or `configurations` is replaced rather than unioned, and a merged file is re-serialized with two-space indentation, so a project that keeps its own key loses hand-made formatting in those two files. A `.vscode` file that is not valid JSON cannot be merged and is replaced by the template as a whole. That never happens silently: the plan line reads `Replace .vscode/settings.json: the current file is not valid JSON (…)` instead of the usual `Apply template …`, and the run prints a warning that keys only your project declares are lost. Both appear in `gitzone format`, `gitzone format check` and `gitzone format plan --json`, so you see them before confirming a write.
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/cli',
|
|
6
|
-
version: '8.
|
|
6
|
+
version: '8.3.0',
|
|
7
7
|
description: 'A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.'
|
|
8
8
|
}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The npm scopes the owner publishes under. A release-age rule (pnpm
|
|
3
|
+
* `minimumReleaseAge`, Deno `minimumDependencyAge`) holds back freshly
|
|
4
|
+
* published third-party versions; it must never hold back our own packages,
|
|
5
|
+
* which are consumed right after their release.
|
|
6
|
+
*
|
|
7
|
+
* This list is the single source for those exemptions. `gitzone format`
|
|
8
|
+
* writes it into the root `deno.json` as `minimumDependencyAge.exclude`
|
|
9
|
+
* (`npm:<scope>/*` per scope), so no repository keeps a hand-copied list.
|
|
10
|
+
*/
|
|
11
|
+
export const ownerNpmScopes = [
|
|
12
|
+
'@api.global',
|
|
13
|
+
'@apiclient.xyz',
|
|
14
|
+
'@apiglobal_private',
|
|
15
|
+
'@bellini.io',
|
|
16
|
+
'@bellini_private',
|
|
17
|
+
'@cardanotech',
|
|
18
|
+
'@central.eu',
|
|
19
|
+
'@coffee.link',
|
|
20
|
+
'@coffee.link_private',
|
|
21
|
+
'@configvault.io',
|
|
22
|
+
'@consent.software',
|
|
23
|
+
'@consentsoftware',
|
|
24
|
+
'@consentsoftware_private',
|
|
25
|
+
'@design.estate',
|
|
26
|
+
'@designestate',
|
|
27
|
+
'@doclake',
|
|
28
|
+
'@ecobridge',
|
|
29
|
+
'@ecobridge.xyz',
|
|
30
|
+
'@fin.cx',
|
|
31
|
+
'@foss.global',
|
|
32
|
+
'@freelance-club',
|
|
33
|
+
'@freelance.club_private',
|
|
34
|
+
'@git.zone',
|
|
35
|
+
'@homebridgelink',
|
|
36
|
+
'@host.today',
|
|
37
|
+
'@idp.global',
|
|
38
|
+
'@in.work',
|
|
39
|
+
'@lossless',
|
|
40
|
+
'@lossless.org',
|
|
41
|
+
'@losslessdirectory_private',
|
|
42
|
+
'@lossless.zone',
|
|
43
|
+
'@losslessone_private',
|
|
44
|
+
'@losslessone_websites',
|
|
45
|
+
'@maintainable.xyz',
|
|
46
|
+
'@modelgrid.com',
|
|
47
|
+
'@modelprofile.com',
|
|
48
|
+
'@mojoio',
|
|
49
|
+
'@nevermind.finance',
|
|
50
|
+
'@onboard.me',
|
|
51
|
+
'@playcontrol',
|
|
52
|
+
'@playcontrol_private',
|
|
53
|
+
'@push.rocks',
|
|
54
|
+
'@serve.zone',
|
|
55
|
+
'@servezone_private',
|
|
56
|
+
'@ship.zone',
|
|
57
|
+
'@shipzone',
|
|
58
|
+
'@signature.digital',
|
|
59
|
+
'@signup.software',
|
|
60
|
+
'@signup.software_private',
|
|
61
|
+
'@smarthome.exchange',
|
|
62
|
+
'@social.io',
|
|
63
|
+
'@social.io_private',
|
|
64
|
+
'@stack.gallery',
|
|
65
|
+
'@start.plus',
|
|
66
|
+
'@tempfix',
|
|
67
|
+
'@tsclass',
|
|
68
|
+
'@uptime.link',
|
|
69
|
+
'@uptime.link_private',
|
|
70
|
+
'@uptimelink_private',
|
|
71
|
+
'@workspace.global_private',
|
|
72
|
+
] as const;
|
|
73
|
+
|
|
74
|
+
/**
|
|
75
|
+
* The minimum dependency age `gitzone format` writes into a root `deno.json`
|
|
76
|
+
* that sets none (a missing or `null` age): 7 days, as an ISO 8601 duration.
|
|
77
|
+
* It mirrors the owner's pnpm `minimumReleaseAge` of 10080 minutes, so
|
|
78
|
+
* third-party packages wait as long under Deno as under pnpm. An age a project
|
|
79
|
+
* already sets is never changed.
|
|
80
|
+
*/
|
|
81
|
+
export const ownerMinimumDependencyAge = 'P7D';
|
package/ts/index.ts
CHANGED
|
@@ -0,0 +1,219 @@
|
|
|
1
|
+
import { BaseFormatter } from '../classes.baseformatter.js';
|
|
2
|
+
import type { IFormatWarning, IPlannedChange } from '../interfaces.format.js';
|
|
3
|
+
import * as plugins from '../mod.plugins.js';
|
|
4
|
+
import { logger } from '../../gitzone.logging.js';
|
|
5
|
+
import { ownerMinimumDependencyAge, ownerNpmScopes } from '../../helpers.ownerscopes.js';
|
|
6
|
+
|
|
7
|
+
/** The config files Deno loads from a directory: deno.json, else deno.jsonc. */
|
|
8
|
+
const denoConfigNames = ['deno.json', 'deno.jsonc'] as const;
|
|
9
|
+
|
|
10
|
+
/** The `minimumDependencyAge.exclude` entries that exempt every package of the owner scopes. */
|
|
11
|
+
export const ownerDependencyAgeExcludes: readonly string[] = ownerNpmScopes.map(
|
|
12
|
+
(scopeArg) => `npm:${scopeArg}/*`,
|
|
13
|
+
);
|
|
14
|
+
|
|
15
|
+
interface IDenoConfigFile {
|
|
16
|
+
path: string;
|
|
17
|
+
content: string;
|
|
18
|
+
/** Undefined when the file is not a plain JSON object; `problem` says why. */
|
|
19
|
+
config?: Record<string, unknown>;
|
|
20
|
+
problem?: string;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
interface IDenoInspection {
|
|
24
|
+
changes: IPlannedChange[];
|
|
25
|
+
warnings: IFormatWarning[];
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
const isPlainObject = (valueArg: unknown): valueArg is Record<string, unknown> =>
|
|
29
|
+
valueArg !== null && typeof valueArg === 'object' && !Array.isArray(valueArg);
|
|
30
|
+
|
|
31
|
+
const readDenoConfig = async (dirArg: string): Promise<IDenoConfigFile | undefined> => {
|
|
32
|
+
for (const name of denoConfigNames) {
|
|
33
|
+
const path = plugins.path.join(dirArg, name);
|
|
34
|
+
if (!(await plugins.smartfs.file(path).exists())) {
|
|
35
|
+
continue;
|
|
36
|
+
}
|
|
37
|
+
const content = (await plugins.smartfs.file(path).encoding('utf8').read()) as string;
|
|
38
|
+
try {
|
|
39
|
+
const parsed: unknown = JSON.parse(content);
|
|
40
|
+
return isPlainObject(parsed)
|
|
41
|
+
? { path, content, config: parsed }
|
|
42
|
+
: { path, content, problem: 'it does not hold a JSON object' };
|
|
43
|
+
} catch (error) {
|
|
44
|
+
return { path, content, problem: error instanceof Error ? error.message : String(error) };
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return undefined;
|
|
48
|
+
};
|
|
49
|
+
|
|
50
|
+
/** The member list of a deno.json `workspace` (a list, or `{ "members": [...] }`); undefined without one. */
|
|
51
|
+
const workspaceMembers = (configArg: Record<string, unknown>): string[] | undefined => {
|
|
52
|
+
const workspace = configArg.workspace;
|
|
53
|
+
const members = isPlainObject(workspace) ? workspace.members : workspace;
|
|
54
|
+
return Array.isArray(members)
|
|
55
|
+
? members.filter((memberArg): memberArg is string => typeof memberArg === 'string')
|
|
56
|
+
: undefined;
|
|
57
|
+
};
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* The absolute directories of the workspace members that carry a Deno config file. Members are
|
|
61
|
+
* paths or glob patterns relative to the root; a `!` entry removes the members it matches.
|
|
62
|
+
*/
|
|
63
|
+
const workspaceMemberDirs = async (rootDirArg: string, membersArg: string[]): Promise<string[]> => {
|
|
64
|
+
const included = new Set<string>();
|
|
65
|
+
const excluded = new Set<string>();
|
|
66
|
+
for (const member of membersArg) {
|
|
67
|
+
const negated = member.startsWith('!');
|
|
68
|
+
const pattern = (negated ? member.slice(1) : member).replace(/\/+$/, '');
|
|
69
|
+
for (const name of denoConfigNames) {
|
|
70
|
+
for await (const match of plugins.fs.glob(`${pattern}/${name}`, { cwd: rootDirArg })) {
|
|
71
|
+
(negated ? excluded : included).add(
|
|
72
|
+
plugins.path.dirname(plugins.path.resolve(rootDirArg, match)),
|
|
73
|
+
);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
return [...included].filter((dirArg) => !excluded.has(dirArg)).sort();
|
|
78
|
+
};
|
|
79
|
+
|
|
80
|
+
/** The deno config of the nearest enclosing workspace that lists `dirArg` as a member. */
|
|
81
|
+
const findEnclosingWorkspace = async (dirArg: string): Promise<string | undefined> => {
|
|
82
|
+
for (let dir = plugins.path.dirname(dirArg); ; dir = plugins.path.dirname(dir)) {
|
|
83
|
+
const file = await readDenoConfig(dir);
|
|
84
|
+
const members = file?.config ? workspaceMembers(file.config) : undefined;
|
|
85
|
+
if (file && members) {
|
|
86
|
+
return (await workspaceMemberDirs(dir, members)).includes(dirArg) ? file.path : undefined;
|
|
87
|
+
}
|
|
88
|
+
if (plugins.path.dirname(dir) === dir) {
|
|
89
|
+
return undefined;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
};
|
|
93
|
+
|
|
94
|
+
/**
|
|
95
|
+
* `minimumDependencyAge` as `{ age, exclude }` with every owner scope excluded. An age the project
|
|
96
|
+
* sets (a scalar or `age`, `false` and `0` included) is kept; a missing or `null` one becomes
|
|
97
|
+
* `ownerMinimumDependencyAge`. Project-specific exclusions are kept, deduplicated and sorted.
|
|
98
|
+
*/
|
|
99
|
+
const withOwnerExcludes = (currentArg: unknown): { value: Record<string, unknown> } | { problem: string } => {
|
|
100
|
+
const build = (ageArg: unknown, excludeArg: unknown, restArg: Record<string, unknown> = {}) => {
|
|
101
|
+
if (!Array.isArray(excludeArg) || excludeArg.some((entryArg) => typeof entryArg !== 'string')) {
|
|
102
|
+
return { problem: 'minimumDependencyAge.exclude is not a list of strings' };
|
|
103
|
+
}
|
|
104
|
+
return {
|
|
105
|
+
value: {
|
|
106
|
+
age: ageArg ?? ownerMinimumDependencyAge,
|
|
107
|
+
exclude: [...new Set([...(excludeArg as string[]), ...ownerDependencyAgeExcludes])].sort(),
|
|
108
|
+
...restArg,
|
|
109
|
+
},
|
|
110
|
+
};
|
|
111
|
+
};
|
|
112
|
+
if (currentArg === undefined || currentArg === null) {
|
|
113
|
+
return build(undefined, []);
|
|
114
|
+
}
|
|
115
|
+
if (typeof currentArg === 'string' || typeof currentArg === 'number' || currentArg === false) {
|
|
116
|
+
return build(currentArg, []);
|
|
117
|
+
}
|
|
118
|
+
if (isPlainObject(currentArg)) {
|
|
119
|
+
const { age, exclude, ...rest } = currentArg;
|
|
120
|
+
return build(age, exclude ?? [], rest);
|
|
121
|
+
}
|
|
122
|
+
return { problem: 'minimumDependencyAge is neither an age nor { "age", "exclude" }' };
|
|
123
|
+
};
|
|
124
|
+
|
|
125
|
+
/**
|
|
126
|
+
* Keeps Deno's minimum dependency age from holding back the owner's own packages: the root
|
|
127
|
+
* deno.json(c) of a Deno project gets `npm:<scope>/*` in `minimumDependencyAge.exclude` for every
|
|
128
|
+
* owner scope, and the owner's age when it sets none. Deno reads the setting from the workspace
|
|
129
|
+
* root only, so members are never written; a member that sets it is reported. Files that are
|
|
130
|
+
* not plain JSON are reported instead of rewritten, so their comments are never dropped.
|
|
131
|
+
*/
|
|
132
|
+
export class DenoFormatter extends BaseFormatter {
|
|
133
|
+
get name(): string {
|
|
134
|
+
return 'deno';
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
async analyze(): Promise<IPlannedChange[]> {
|
|
138
|
+
return (await this.inspect()).changes;
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
async validate(): Promise<IFormatWarning[]> {
|
|
142
|
+
return (await this.inspect()).warnings;
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
async applyChange(change: IPlannedChange): Promise<void> {
|
|
146
|
+
if (change.type !== 'modify' || !change.content) return;
|
|
147
|
+
|
|
148
|
+
await this.modifyFile(change.path, change.content);
|
|
149
|
+
logger.log('info', `Updated minimumDependencyAge in ${change.path}`);
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
private async inspect(): Promise<IDenoInspection> {
|
|
153
|
+
const inspection: IDenoInspection = { changes: [], warnings: [] };
|
|
154
|
+
const warn = (levelArg: IFormatWarning['level'], messageArg: string) =>
|
|
155
|
+
inspection.warnings.push({ level: levelArg, module: this.name, message: messageArg });
|
|
156
|
+
|
|
157
|
+
const file = await readDenoConfig('.');
|
|
158
|
+
if (!file) {
|
|
159
|
+
return inspection;
|
|
160
|
+
}
|
|
161
|
+
if (!file.config) {
|
|
162
|
+
warn(
|
|
163
|
+
'error',
|
|
164
|
+
`${file.path} is not plain JSON (${file.problem}). gitzone format edits plain JSON only so it never drops comments; make it plain JSON, or add the owner scopes to minimumDependencyAge.exclude by hand.`,
|
|
165
|
+
);
|
|
166
|
+
return inspection;
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
const cwd = process.cwd();
|
|
170
|
+
const members = workspaceMembers(file.config);
|
|
171
|
+
if (!members) {
|
|
172
|
+
const workspaceRoot = await findEnclosingWorkspace(cwd);
|
|
173
|
+
if (workspaceRoot) {
|
|
174
|
+
warn(
|
|
175
|
+
Object.hasOwn(file.config, 'minimumDependencyAge') ? 'warning' : 'info',
|
|
176
|
+
`${file.path} is a member of the Deno workspace at ${workspaceRoot}, which holds minimumDependencyAge; Deno ignores the setting in a member.`,
|
|
177
|
+
);
|
|
178
|
+
return inspection;
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
for (const memberDir of await workspaceMemberDirs(cwd, members ?? [])) {
|
|
183
|
+
const memberFile = await readDenoConfig(memberDir);
|
|
184
|
+
if (!memberFile) {
|
|
185
|
+
continue; // removed since the workspace was listed
|
|
186
|
+
}
|
|
187
|
+
const memberPath = plugins.path.relative(cwd, memberFile.path);
|
|
188
|
+
if (!memberFile.config) {
|
|
189
|
+
warn('warning', `Cannot read the workspace member ${memberPath} as plain JSON (${memberFile.problem}).`);
|
|
190
|
+
} else if (Object.hasOwn(memberFile.config, 'minimumDependencyAge')) {
|
|
191
|
+
warn(
|
|
192
|
+
'warning',
|
|
193
|
+
`The workspace member ${memberPath} sets minimumDependencyAge, which Deno ignores outside the workspace root; remove it there, ${file.path} applies.`,
|
|
194
|
+
);
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
const current = file.config.minimumDependencyAge;
|
|
199
|
+
const merged = withOwnerExcludes(current);
|
|
200
|
+
if ('problem' in merged) {
|
|
201
|
+
warn('error', `${file.path}: ${merged.problem}.`);
|
|
202
|
+
return inspection;
|
|
203
|
+
}
|
|
204
|
+
if (JSON.stringify(merged.value) === JSON.stringify(current)) {
|
|
205
|
+
return inspection;
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
const indent = /\n([ \t]+)"/.exec(file.content)?.[1] ?? ' ';
|
|
209
|
+
const updated = { ...file.config, minimumDependencyAge: merged.value };
|
|
210
|
+
inspection.changes.push({
|
|
211
|
+
type: 'modify',
|
|
212
|
+
path: file.path,
|
|
213
|
+
module: this.name,
|
|
214
|
+
description: "Exclude the owner scopes from Deno's minimum dependency age",
|
|
215
|
+
content: `${JSON.stringify(updated, null, indent)}${file.content.endsWith('\n') ? '\n' : ''}`,
|
|
216
|
+
});
|
|
217
|
+
return inspection;
|
|
218
|
+
}
|
|
219
|
+
}
|
package/ts/mod_format/index.ts
CHANGED
|
@@ -25,6 +25,7 @@ import { TemplatesFormatter } from "./formatters/templates.formatter.js";
|
|
|
25
25
|
import { AssetsFormatter } from "./formatters/assets.formatter.js";
|
|
26
26
|
import { GitignoreFormatter } from "./formatters/gitignore.formatter.js";
|
|
27
27
|
import { TsconfigFormatter } from "./formatters/tsconfig.formatter.js";
|
|
28
|
+
import { DenoFormatter } from "./formatters/deno.formatter.js";
|
|
28
29
|
import { PrettierFormatter } from "./formatters/prettier.formatter.js";
|
|
29
30
|
import { ReadmeFormatter } from "./formatters/readme.formatter.js";
|
|
30
31
|
import { CopyFormatter } from "./formatters/copy.formatter.js";
|
|
@@ -70,6 +71,7 @@ const formatterMap: Record<
|
|
|
70
71
|
assets: AssetsFormatter,
|
|
71
72
|
gitignore: GitignoreFormatter,
|
|
72
73
|
tsconfig: TsconfigFormatter,
|
|
74
|
+
deno: DenoFormatter,
|
|
73
75
|
prettier: PrettierFormatter,
|
|
74
76
|
readme: ReadmeFormatter,
|
|
75
77
|
copy: CopyFormatter,
|
|
@@ -81,6 +83,7 @@ const formattersNotRequiringProjectType = [
|
|
|
81
83
|
"prettier",
|
|
82
84
|
"cleanup",
|
|
83
85
|
"packagejson",
|
|
86
|
+
"deno",
|
|
84
87
|
];
|
|
85
88
|
|
|
86
89
|
const getFormatConfig = async () => {
|