@loomweaver/devkit 0.7.5 → 0.7.7
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/package.json +1 -1
- package/src/generators/auth-source/generator.js +4 -7
- package/src/generators/auth-source/generator.js.map +1 -1
- package/src/generators/distribution/generator.js +51 -53
- package/src/generators/distribution/generator.js.map +1 -1
- package/src/generators/distribution/nx-files.js +23 -16
- package/src/generators/distribution/nx-files.js.map +1 -1
- package/src/generators/frame-plugin/generator.js +7 -10
- package/src/generators/frame-plugin/generator.js.map +1 -1
- package/src/generators/layout/generator.js +4 -7
- package/src/generators/layout/generator.js.map +1 -1
- package/src/generators/nx-scaffold-shared.js +2 -3
- package/src/generators/nx-scaffold-shared.js.map +1 -1
- package/src/generators/settings-store/generator.js +4 -7
- package/src/generators/settings-store/generator.js.map +1 -1
- package/src/generators/shared.d.ts +1 -1
- package/src/generators/shared.js +23 -20
- package/src/generators/shared.js.map +1 -1
- package/src/generators/theme/generator.js +4 -7
- package/src/generators/theme/generator.js.map +1 -1
- package/src/generators/weaver/generator.d.ts +2 -2
- package/src/generators/weaver/generator.js +66 -56
- package/src/generators/weaver/generator.js.map +1 -1
- package/src/generators/weaver/nx-files.js +20 -15
- package/src/generators/weaver/nx-files.js.map +1 -1
- package/src/generators/weaver/schema.json +5 -0
- package/src/index.d.ts +6 -6
- package/src/index.js +2 -1
- package/src/index.js.map +1 -1
- package/src/lib/amend/compose.js +37 -8
- package/src/lib/amend/compose.js.map +1 -1
- package/src/lib/amend/describe.js +3 -0
- package/src/lib/amend/describe.js.map +1 -1
- package/src/lib/amend/merge.d.ts +8 -1
- package/src/lib/amend/merge.js +64 -22
- package/src/lib/amend/merge.js.map +1 -1
- package/src/lib/amend/types.d.ts +12 -1
- package/src/lib/generate/generate.js +2 -3
- package/src/lib/generate/generate.js.map +1 -1
- package/src/lib/scaffolds/inputs.d.ts +1 -0
- package/src/lib/scaffolds/inputs.js +5 -5
- package/src/lib/scaffolds/inputs.js.map +1 -1
- package/src/lib/scaffolds/scaffolds.js +24 -18
- package/src/lib/scaffolds/scaffolds.js.map +1 -1
- package/src/lib/validate/catalog.js +20 -6
- package/src/lib/validate/catalog.js.map +1 -1
- package/src/lib/validate/i18n.js +1 -1
- package/src/lib/validate/i18n.js.map +1 -1
- package/src/recipes/angular-distribution/recipe.js +16 -5
- package/src/recipes/angular-distribution/recipe.js.map +1 -1
- package/src/recipes/angular-weaver/agent-files.d.ts +12 -0
- package/src/recipes/angular-weaver/agent-files.js +169 -0
- package/src/recipes/angular-weaver/agent-files.js.map +1 -0
- package/src/recipes/angular-weaver/agent-panel.d.ts +3 -0
- package/src/recipes/angular-weaver/agent-panel.js +193 -0
- package/src/recipes/angular-weaver/agent-panel.js.map +1 -0
- package/src/recipes/angular-weaver/agent-stand-in.d.ts +2 -0
- package/src/recipes/angular-weaver/agent-stand-in.js +93 -0
- package/src/recipes/angular-weaver/agent-stand-in.js.map +1 -0
- package/src/recipes/angular-weaver/amendments.d.ts +1 -1
- package/src/recipes/angular-weaver/amendments.js +19 -2
- package/src/recipes/angular-weaver/amendments.js.map +1 -1
- package/src/recipes/angular-weaver/recipe.d.ts +2 -0
- package/src/recipes/angular-weaver/recipe.js +48 -136
- package/src/recipes/angular-weaver/recipe.js.map +1 -1
- package/src/recipes/angular-weaver/weaver-i18n.d.ts +1 -1
- package/src/recipes/angular-weaver/weaver-i18n.js +11 -0
- package/src/recipes/angular-weaver/weaver-i18n.js.map +1 -1
- package/src/recipes/angular-weaver/weaver-readme.d.ts +2 -0
- package/src/recipes/angular-weaver/weaver-readme.js +142 -0
- package/src/recipes/angular-weaver/weaver-readme.js.map +1 -0
- package/src/recipes/angular-weaver/weaver-terms.d.ts +2 -0
- package/src/recipes/angular-weaver/weaver-terms.js +9 -0
- package/src/recipes/angular-weaver/weaver-terms.js.map +1 -0
- package/src/recipes/frame-plugin/recipe.js +1 -2
- package/src/recipes/frame-plugin/recipe.js.map +1 -1
- package/src/recipes/layout/recipe.js +2 -3
- package/src/recipes/layout/recipe.js.map +1 -1
- package/src/recipes/theme/recipe.js +1 -2
- package/src/recipes/theme/recipe.js.map +1 -1
package/src/lib/amend/merge.js
CHANGED
|
@@ -1,12 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.normalizeProjectRoot = normalizeProjectRoot;
|
|
3
4
|
exports.joinProjectPath = joinProjectPath;
|
|
4
5
|
exports.resolveAssetInput = resolveAssetInput;
|
|
5
6
|
exports.ensurePostcssPlugin = ensurePostcssPlugin;
|
|
7
|
+
exports.ensureDependency = ensureDependency;
|
|
6
8
|
exports.ensureBuildTarget = ensureBuildTarget;
|
|
7
9
|
exports.ensureStylesheetSource = ensureStylesheetSource;
|
|
10
|
+
function normalizeProjectRoot(value) {
|
|
11
|
+
const rooted = value.replace(/^\.?\/*/, '');
|
|
12
|
+
let end = rooted.length;
|
|
13
|
+
while (end > 0 && rooted[end - 1] === '/') {
|
|
14
|
+
end -= 1;
|
|
15
|
+
}
|
|
16
|
+
return rooted.slice(0, end);
|
|
17
|
+
}
|
|
8
18
|
function joinProjectPath(projectRoot, path) {
|
|
9
|
-
const root = projectRoot
|
|
19
|
+
const root = normalizeProjectRoot(projectRoot);
|
|
10
20
|
return root ? `${root}/${path}` : path;
|
|
11
21
|
}
|
|
12
22
|
function resolveAssetInput(glob, projectRoot) {
|
|
@@ -15,8 +25,7 @@ function resolveAssetInput(glob, projectRoot) {
|
|
|
15
25
|
: glob.input;
|
|
16
26
|
}
|
|
17
27
|
function ensurePostcssPlugin(existing, amendment) {
|
|
18
|
-
|
|
19
|
-
const root = (_a = asObject(existing)) !== null && _a !== void 0 ? _a : {};
|
|
28
|
+
const root = asObject(existing) ?? {};
|
|
20
29
|
const plugins = asObject(root['plugins']);
|
|
21
30
|
if (plugins === undefined && root['plugins'] !== undefined) {
|
|
22
31
|
return {
|
|
@@ -25,23 +34,52 @@ function ensurePostcssPlugin(existing, amendment) {
|
|
|
25
34
|
declined: [`${amendment.file}: "plugins" is not an object`],
|
|
26
35
|
};
|
|
27
36
|
}
|
|
28
|
-
const next =
|
|
29
|
-
if (amendment.plugin
|
|
37
|
+
const next = { ...plugins };
|
|
38
|
+
if (Object.hasOwn(next, amendment.plugin)) {
|
|
30
39
|
return { value: root, added: [], declined: [] };
|
|
31
40
|
}
|
|
32
41
|
next[amendment.plugin] = {};
|
|
33
42
|
return {
|
|
34
|
-
value:
|
|
43
|
+
value: { ...root, plugins: next },
|
|
35
44
|
added: [`${amendment.file}: ${amendment.plugin}`],
|
|
36
45
|
declined: [],
|
|
37
46
|
};
|
|
38
47
|
}
|
|
48
|
+
/**
|
|
49
|
+
* Records a package the generated files need in the project's manifest. A version already recorded
|
|
50
|
+
* wins wherever it stands — a consumer who pinned it, or moved it to devDependencies, chose that on
|
|
51
|
+
* purpose and this is an "ensure it is present", not a "set it to".
|
|
52
|
+
*/
|
|
53
|
+
function ensureDependency(manifest, amendment) {
|
|
54
|
+
const root = asObject(manifest) ?? {};
|
|
55
|
+
const dependencies = asObject(root['dependencies']);
|
|
56
|
+
if (dependencies === undefined && root['dependencies'] !== undefined) {
|
|
57
|
+
return {
|
|
58
|
+
value: root,
|
|
59
|
+
added: [],
|
|
60
|
+
declined: ['package.json: "dependencies" is not an object'],
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
const recorded = dependencies?.[amendment.name] ??
|
|
64
|
+
asObject(root['devDependencies'])?.[amendment.name];
|
|
65
|
+
if (recorded !== undefined) {
|
|
66
|
+
return { value: root, added: [], declined: [] };
|
|
67
|
+
}
|
|
68
|
+
const next = { ...dependencies, [amendment.name]: amendment.version };
|
|
69
|
+
return {
|
|
70
|
+
value: {
|
|
71
|
+
...root,
|
|
72
|
+
dependencies: Object.fromEntries(Object.entries(next).toSorted(([a], [b]) => a.localeCompare(b))),
|
|
73
|
+
},
|
|
74
|
+
added: [`dependencies: ${amendment.name}@${amendment.version}`],
|
|
75
|
+
declined: [],
|
|
76
|
+
};
|
|
77
|
+
}
|
|
39
78
|
function ensureBuildTarget(target, amendment, projectRoot) {
|
|
40
|
-
|
|
41
|
-
const next = Object.assign({}, ((_a = asObject(target)) !== null && _a !== void 0 ? _a : {}));
|
|
79
|
+
const next = { ...asObject(target) };
|
|
42
80
|
const added = [];
|
|
43
81
|
const declined = [];
|
|
44
|
-
const options =
|
|
82
|
+
const options = { ...asObject(next['options']) };
|
|
45
83
|
const styles = ensureStrings(options['styles'], amendment.styles.map((style) => joinProjectPath(projectRoot, style)));
|
|
46
84
|
if (styles.added.length > 0) {
|
|
47
85
|
options['styles'] = styles.value;
|
|
@@ -54,8 +92,8 @@ function ensureBuildTarget(target, amendment, projectRoot) {
|
|
|
54
92
|
}
|
|
55
93
|
next['options'] = options;
|
|
56
94
|
if (amendment.inlineCritical !== undefined || amendment.serviceWorker) {
|
|
57
|
-
const configurations =
|
|
58
|
-
const production =
|
|
95
|
+
const configurations = { ...asObject(next['configurations']) };
|
|
96
|
+
const production = { ...asObject(configurations['production']) };
|
|
59
97
|
if (amendment.serviceWorker && production['serviceWorker'] === undefined) {
|
|
60
98
|
production['serviceWorker'] = joinProjectPath(projectRoot, amendment.serviceWorker);
|
|
61
99
|
added.push(`production serviceWorker: ${production['serviceWorker']}`);
|
|
@@ -78,27 +116,26 @@ function ensureBuildTarget(target, amendment, projectRoot) {
|
|
|
78
116
|
return { value: next, added, declined };
|
|
79
117
|
}
|
|
80
118
|
function ensureStylesheetSource(css, source) {
|
|
81
|
-
const quoted = source.
|
|
82
|
-
if (new RegExp(`@source
|
|
119
|
+
const quoted = source.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw `\$&`);
|
|
120
|
+
if (new RegExp(String.raw `@source\s+['"]${quoted}/?['"]`).test(css)) {
|
|
83
121
|
return css;
|
|
84
122
|
}
|
|
85
123
|
return `${css.trimEnd()}\n\n@source '${source}';\n`;
|
|
86
124
|
}
|
|
87
125
|
function ensureInlineCritical(optimization, inlineCritical) {
|
|
88
|
-
var _a;
|
|
89
126
|
if (typeof optimization === 'boolean') {
|
|
90
127
|
return { value: optimization, changed: false, declined: true };
|
|
91
128
|
}
|
|
92
|
-
const root =
|
|
129
|
+
const root = { ...asObject(optimization) };
|
|
93
130
|
const styles = asObject(root['styles']);
|
|
94
131
|
if (styles === undefined && root['styles'] !== undefined) {
|
|
95
132
|
return { value: optimization, changed: false, declined: true };
|
|
96
133
|
}
|
|
97
|
-
if (
|
|
134
|
+
if (styles?.['inlineCritical'] !== undefined) {
|
|
98
135
|
return { value: optimization, changed: false, declined: false };
|
|
99
136
|
}
|
|
100
137
|
return {
|
|
101
|
-
value:
|
|
138
|
+
value: { ...root, styles: { ...styles, inlineCritical } },
|
|
102
139
|
changed: true,
|
|
103
140
|
declined: false,
|
|
104
141
|
};
|
|
@@ -107,10 +144,11 @@ function ensureStrings(existing, wanted) {
|
|
|
107
144
|
const list = Array.isArray(existing) ? [...existing] : [];
|
|
108
145
|
const added = [];
|
|
109
146
|
for (const entry of wanted) {
|
|
110
|
-
if (
|
|
111
|
-
|
|
112
|
-
added.push(entry);
|
|
147
|
+
if (list.includes(entry)) {
|
|
148
|
+
continue;
|
|
113
149
|
}
|
|
150
|
+
list.push(entry);
|
|
151
|
+
added.push(entry);
|
|
114
152
|
}
|
|
115
153
|
return { value: list, added };
|
|
116
154
|
}
|
|
@@ -122,7 +160,11 @@ function ensureAssets(existing, wanted, projectRoot) {
|
|
|
122
160
|
if (list.some((entry) => inputOf(entry) === input)) {
|
|
123
161
|
continue;
|
|
124
162
|
}
|
|
125
|
-
list.push(
|
|
163
|
+
list.push({
|
|
164
|
+
glob: glob.glob,
|
|
165
|
+
input,
|
|
166
|
+
...(glob.output !== undefined && { output: glob.output }),
|
|
167
|
+
});
|
|
126
168
|
added.push(input);
|
|
127
169
|
}
|
|
128
170
|
return { value: list, added };
|
|
@@ -132,7 +174,7 @@ function inputOf(entry) {
|
|
|
132
174
|
return entry;
|
|
133
175
|
}
|
|
134
176
|
const asset = asObject(entry);
|
|
135
|
-
return typeof
|
|
177
|
+
return typeof asset?.['input'] === 'string' ? asset['input'] : undefined;
|
|
136
178
|
}
|
|
137
179
|
function asObject(value) {
|
|
138
180
|
return typeof value === 'object' && value !== null && !Array.isArray(value)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/amend/merge.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/amend/merge.ts"],"names":[],"mappings":"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"}
|
package/src/lib/amend/types.d.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* Every amendment is an "ensure this is present", never a "set this to". Applying one twice changes
|
|
6
6
|
* nothing, and a value the consumer already chose always wins.
|
|
7
7
|
*/
|
|
8
|
-
export type Amendment = PostcssAmendment | BuildTargetAmendment | StylesheetSourceAmendment | ComposePluginAmendment;
|
|
8
|
+
export type Amendment = PostcssAmendment | BuildTargetAmendment | StylesheetSourceAmendment | ComposePluginAmendment | PackageAmendment;
|
|
9
9
|
/**
|
|
10
10
|
* An entry in a build target's `assets` array. Where the input is resolved from differs per entry
|
|
11
11
|
* and cannot be guessed: the project's own folder is named relative to the project, an installed
|
|
@@ -65,3 +65,14 @@ export interface ComposePluginAmendment {
|
|
|
65
65
|
/** Workspace-relative, because only the applying route knows where the composition root sits. */
|
|
66
66
|
readonly sourceRoot: string;
|
|
67
67
|
}
|
|
68
|
+
/**
|
|
69
|
+
* A package the generated files import and the consumer's project may not carry. Stated as a need
|
|
70
|
+
* rather than as a version to set: a route that can reach the workspace records it, a route that
|
|
71
|
+
* cannot names it, and a version the consumer already chose is never overwritten.
|
|
72
|
+
*/
|
|
73
|
+
export interface PackageAmendment {
|
|
74
|
+
readonly kind: 'package';
|
|
75
|
+
readonly name: string;
|
|
76
|
+
/** The range to record when nothing is recorded yet. */
|
|
77
|
+
readonly version: string;
|
|
78
|
+
}
|
|
@@ -10,14 +10,13 @@ function isUnsafePath(path) {
|
|
|
10
10
|
}
|
|
11
11
|
function generate(recipe, input) {
|
|
12
12
|
const files = recipe.build(input);
|
|
13
|
-
const unsafe = Object.keys(files).find(isUnsafePath);
|
|
13
|
+
const unsafe = Object.keys(files).find((path) => isUnsafePath(path));
|
|
14
14
|
if (unsafe !== undefined) {
|
|
15
15
|
throw new Error(`Recipe "${recipe.id}" produced an unsafe path: "${unsafe}".`);
|
|
16
16
|
}
|
|
17
17
|
return files;
|
|
18
18
|
}
|
|
19
19
|
function amendments(recipe, input) {
|
|
20
|
-
|
|
21
|
-
return (_b = (_a = recipe.amend) === null || _a === void 0 ? void 0 : _a.call(recipe, input)) !== null && _b !== void 0 ? _b : [];
|
|
20
|
+
return recipe.amend?.(input) ?? [];
|
|
22
21
|
}
|
|
23
22
|
//# sourceMappingURL=generate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/generate/generate.ts"],"names":[],"mappings":";;AAYA,4BAOC;AAED,gCAKC;AAvBD,SAAS,YAAY,CAAC,IAAY;IAChC,OAAO,CACL,IAAI,CAAC,MAAM,KAAK,CAAC;QACjB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QACpB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QACnB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAC/B,CAAC;AACJ,CAAC;AAED,SAAgB,QAAQ,CAAQ,MAAqB,EAAE,KAAY;IACjE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/generate/generate.ts"],"names":[],"mappings":";;AAYA,4BAOC;AAED,gCAKC;AAvBD,SAAS,YAAY,CAAC,IAAY;IAChC,OAAO,CACL,IAAI,CAAC,MAAM,KAAK,CAAC;QACjB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QACpB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QACnB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAC/B,CAAC;AACJ,CAAC;AAED,SAAgB,QAAQ,CAAQ,MAAqB,EAAE,KAAY;IACjE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;IACrE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,WAAW,MAAM,CAAC,EAAE,+BAA+B,MAAM,IAAI,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,UAAU,CACxB,MAAqB,EACrB,KAAY;IAEZ,OAAO,MAAM,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;AACrC,CAAC"}
|
|
@@ -14,6 +14,7 @@ export declare function weaverInput(values: ScaffoldValues): {
|
|
|
14
14
|
about: boolean | undefined;
|
|
15
15
|
instanceable: boolean | undefined;
|
|
16
16
|
container: boolean | undefined;
|
|
17
|
+
agent: boolean | undefined;
|
|
17
18
|
access: string | undefined;
|
|
18
19
|
spec: boolean | undefined;
|
|
19
20
|
};
|
|
@@ -4,9 +4,8 @@ exports.weaverInput = weaverInput;
|
|
|
4
4
|
exports.distributionInput = distributionInput;
|
|
5
5
|
const scaffolds_1 = require("./scaffolds");
|
|
6
6
|
function weaverInput(values) {
|
|
7
|
-
var _a;
|
|
8
7
|
return {
|
|
9
|
-
id: (
|
|
8
|
+
id: (0, scaffolds_1.str)(values, 'id') ?? '',
|
|
10
9
|
name: (0, scaffolds_1.str)(values, 'name'),
|
|
11
10
|
prefix: (0, scaffolds_1.str)(values, 'prefix'),
|
|
12
11
|
importPath: (0, scaffolds_1.str)(values, 'importPath'),
|
|
@@ -19,18 +18,19 @@ function weaverInput(values) {
|
|
|
19
18
|
about: (0, scaffolds_1.bool)(values, 'about'),
|
|
20
19
|
instanceable: (0, scaffolds_1.bool)(values, 'instanceable'),
|
|
21
20
|
container: (0, scaffolds_1.bool)(values, 'container'),
|
|
21
|
+
agent: (0, scaffolds_1.bool)(values, 'agent'),
|
|
22
22
|
access: (0, scaffolds_1.str)(values, 'access'),
|
|
23
23
|
spec: (0, scaffolds_1.bool)(values, 'spec'),
|
|
24
24
|
},
|
|
25
25
|
};
|
|
26
26
|
}
|
|
27
27
|
function distributionInput(values) {
|
|
28
|
-
var _a, _b;
|
|
29
28
|
return {
|
|
30
|
-
name: (
|
|
29
|
+
name: (0, scaffolds_1.str)(values, 'name') ?? '',
|
|
31
30
|
title: (0, scaffolds_1.str)(values, 'title'),
|
|
32
31
|
directory: (0, scaffolds_1.str)(values, 'directory'),
|
|
33
|
-
styles: (
|
|
32
|
+
styles: (0, scaffolds_1.str)(values, 'styles') ??
|
|
33
|
+
'tailwind',
|
|
34
34
|
};
|
|
35
35
|
}
|
|
36
36
|
//# sourceMappingURL=inputs.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inputs.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/scaffolds/inputs.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"inputs.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/scaffolds/inputs.ts"],"names":[],"mappings":";;AAGA,kCAoBC;AAED,8CASC;AAjCD,2CAAmE;AAEnE,SAAgB,WAAW,CAAC,MAAsB;IAChD,OAAO;QACL,EAAE,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE;QAC/B,IAAI,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,MAAM,CAAC;QAC7B,MAAM,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,QAAQ,CAAC;QACjC,UAAU,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,YAAY,CAAC;QACzC,QAAQ,EAAE;YACR,OAAO,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,SAAS,CAAC;YAChC,QAAQ,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,UAAU,CAAC;YACrC,IAAI,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,MAAM,CAAC;YAC7B,OAAO,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,SAAS,CAAC;YAChC,QAAQ,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,UAAU,CAAC;YAClC,KAAK,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,OAAO,CAAC;YAC5B,YAAY,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,cAAc,CAAC;YAC1C,SAAS,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,WAAW,CAAC;YACpC,KAAK,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,OAAO,CAAC;YAC5B,MAAM,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,QAAQ,CAAC;YACjC,IAAI,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,MAAM,CAAC;SAC3B;KACF,CAAC;AACJ,CAAC;AAED,SAAgB,iBAAiB,CAAC,MAAsB;IACtD,OAAO;QACL,IAAI,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;QACnC,KAAK,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,OAAO,CAAC;QAC/B,SAAS,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,WAAW,CAAC;QACvC,MAAM,EACH,IAAA,eAAO,EAAC,MAAM,EAAE,QAAQ,CAAoC;YAC7D,UAAU;KACb,CAAC;AACJ,CAAC"}
|
|
@@ -28,7 +28,7 @@ function bool(values, name) {
|
|
|
28
28
|
}
|
|
29
29
|
/** The kebab-case spelling of a camelCase option, for command lines that prefer it. */
|
|
30
30
|
function kebabCase(name) {
|
|
31
|
-
return name.
|
|
31
|
+
return name.replaceAll(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`);
|
|
32
32
|
}
|
|
33
33
|
const ID_PATTERN = '^[a-z][a-z0-9]*(-[a-z0-9]+)*$';
|
|
34
34
|
const PLACEMENT_OPTIONS = [
|
|
@@ -130,6 +130,12 @@ exports.SCAFFOLDS = [
|
|
|
130
130
|
description: "Make the surface a container: a routable tab at '<id>/:id' holding a nested pane tree of child surfaces, which the host draws. Not combinable with --instanceable.",
|
|
131
131
|
default: false,
|
|
132
132
|
},
|
|
133
|
+
{
|
|
134
|
+
name: 'agent',
|
|
135
|
+
type: 'boolean',
|
|
136
|
+
description: 'Also scaffold the connection that lets an AG-UI agent run the commands this workbench offers: a docked panel, the seam where a call is decided before it runs, and a local stand-in that speaks the protocol so the whole path works on the first serve. Implies --command.',
|
|
137
|
+
default: false,
|
|
138
|
+
},
|
|
133
139
|
{
|
|
134
140
|
name: 'access',
|
|
135
141
|
type: 'string',
|
|
@@ -177,13 +183,10 @@ exports.SCAFFOLDS = [
|
|
|
177
183
|
},
|
|
178
184
|
APP_OPTION,
|
|
179
185
|
],
|
|
180
|
-
build: (values) => {
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
name: str(values, 'name'),
|
|
185
|
-
});
|
|
186
|
-
},
|
|
186
|
+
build: (values) => (0, generate_1.generate)(recipe_5.framePlugin, {
|
|
187
|
+
id: str(values, 'id') ?? '',
|
|
188
|
+
name: str(values, 'name'),
|
|
189
|
+
}),
|
|
187
190
|
},
|
|
188
191
|
{
|
|
189
192
|
name: 'distribution',
|
|
@@ -232,7 +235,7 @@ exports.SCAFFOLDS = [
|
|
|
232
235
|
},
|
|
233
236
|
APP_OPTION,
|
|
234
237
|
],
|
|
235
|
-
build: (values) =>
|
|
238
|
+
build: (values) => (0, generate_1.generate)(recipe_3.authSource, { name: str(values, 'name') ?? '' }),
|
|
236
239
|
},
|
|
237
240
|
{
|
|
238
241
|
name: 'settings-store',
|
|
@@ -247,7 +250,7 @@ exports.SCAFFOLDS = [
|
|
|
247
250
|
},
|
|
248
251
|
APP_OPTION,
|
|
249
252
|
],
|
|
250
|
-
build: (values) =>
|
|
253
|
+
build: (values) => (0, generate_1.generate)(recipe_6.settingsStore, { name: str(values, 'name') ?? '' }),
|
|
251
254
|
},
|
|
252
255
|
{
|
|
253
256
|
name: 'theme',
|
|
@@ -269,13 +272,10 @@ exports.SCAFFOLDS = [
|
|
|
269
272
|
},
|
|
270
273
|
APP_OPTION,
|
|
271
274
|
],
|
|
272
|
-
build: (values) => {
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
preset: (_b = str(values, 'preset')) !== null && _b !== void 0 ? _b : 'literal',
|
|
277
|
-
});
|
|
278
|
-
},
|
|
275
|
+
build: (values) => (0, generate_1.generate)(recipe_7.theme, {
|
|
276
|
+
name: str(values, 'name') ?? '',
|
|
277
|
+
preset: str(values, 'preset') ?? 'literal',
|
|
278
|
+
}),
|
|
279
279
|
},
|
|
280
280
|
{
|
|
281
281
|
name: 'layout',
|
|
@@ -306,7 +306,13 @@ function portableOptions(scaffold) {
|
|
|
306
306
|
function nxSchemaFor(scaffold) {
|
|
307
307
|
const properties = {};
|
|
308
308
|
for (const option of scaffold.options) {
|
|
309
|
-
properties[option.name] =
|
|
309
|
+
properties[option.name] = {
|
|
310
|
+
type: option.type,
|
|
311
|
+
description: option.description,
|
|
312
|
+
...(option.pattern && { pattern: option.pattern }),
|
|
313
|
+
...(option.choices && { enum: option.choices }),
|
|
314
|
+
...(option.default !== undefined && { default: option.default }),
|
|
315
|
+
};
|
|
310
316
|
}
|
|
311
317
|
return {
|
|
312
318
|
$schema: 'https://json-schema.org/schema',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scaffolds.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/scaffolds/scaffolds.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"scaffolds.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/scaffolds/scaffolds.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,6 @@ function isPlainObject(raw) {
|
|
|
31
31
|
return typeof raw === 'object' && raw !== null && !Array.isArray(raw);
|
|
32
32
|
}
|
|
33
33
|
function urlFinding(value, index, field, required) {
|
|
34
|
-
var _a, _b;
|
|
35
34
|
if (typeof value !== 'string' || value.length === 0) {
|
|
36
35
|
return required
|
|
37
36
|
? {
|
|
@@ -47,7 +46,7 @@ function urlFinding(value, index, field, required) {
|
|
|
47
46
|
path: at(index, field),
|
|
48
47
|
};
|
|
49
48
|
}
|
|
50
|
-
const scheme =
|
|
49
|
+
const scheme = /^([a-z][a-z0-9+.-]*):/i.exec(value)?.[1]?.toLowerCase();
|
|
51
50
|
if (scheme && scheme !== 'http' && scheme !== 'https') {
|
|
52
51
|
return {
|
|
53
52
|
level: 'error',
|
|
@@ -111,6 +110,14 @@ function validateEntry(raw, index, known) {
|
|
|
111
110
|
},
|
|
112
111
|
];
|
|
113
112
|
}
|
|
113
|
+
return [
|
|
114
|
+
...validateEntryIdentity(raw, index),
|
|
115
|
+
...validateCapabilities(raw['capabilities'], index, known),
|
|
116
|
+
...validateEntryMetadata(raw, index),
|
|
117
|
+
...validateEntryKeys(raw, index),
|
|
118
|
+
];
|
|
119
|
+
}
|
|
120
|
+
function validateEntryIdentity(raw, index) {
|
|
114
121
|
const findings = [];
|
|
115
122
|
if (typeof raw['id'] !== 'string' || raw['id'].length === 0) {
|
|
116
123
|
findings.push({
|
|
@@ -153,7 +160,10 @@ function validateEntry(raw, index, known) {
|
|
|
153
160
|
path: at(index, 'version'),
|
|
154
161
|
});
|
|
155
162
|
}
|
|
156
|
-
findings
|
|
163
|
+
return findings;
|
|
164
|
+
}
|
|
165
|
+
function validateEntryMetadata(raw, index) {
|
|
166
|
+
const findings = [];
|
|
157
167
|
if (raw['downloads'] !== undefined &&
|
|
158
168
|
(typeof raw['downloads'] !== 'number' || raw['downloads'] < 0)) {
|
|
159
169
|
findings.push({
|
|
@@ -179,6 +189,10 @@ function validateEntry(raw, index, known) {
|
|
|
179
189
|
path: at(index, 'repository'),
|
|
180
190
|
});
|
|
181
191
|
}
|
|
192
|
+
return findings;
|
|
193
|
+
}
|
|
194
|
+
function validateEntryKeys(raw, index) {
|
|
195
|
+
const findings = [];
|
|
182
196
|
for (const key of Object.keys(raw)) {
|
|
183
197
|
if (!exports.CATALOG_ENTRY_KEYS.includes(key)) {
|
|
184
198
|
findings.push({
|
|
@@ -199,7 +213,7 @@ function isHttpUrl(raw) {
|
|
|
199
213
|
const url = new URL(raw);
|
|
200
214
|
return url.protocol === 'http:' || url.protocol === 'https:';
|
|
201
215
|
}
|
|
202
|
-
catch
|
|
216
|
+
catch {
|
|
203
217
|
return false;
|
|
204
218
|
}
|
|
205
219
|
}
|
|
@@ -227,7 +241,7 @@ function validateCatalog(catalog, known = manifest_1.KNOWN_CAPABILITIES) {
|
|
|
227
241
|
}
|
|
228
242
|
const findings = [];
|
|
229
243
|
const seen = new Set();
|
|
230
|
-
catalog.
|
|
244
|
+
for (const [index, entry] of catalog.entries()) {
|
|
231
245
|
findings.push(...validateEntry(entry, index, known));
|
|
232
246
|
const id = isPlainObject(entry) ? entry['id'] : undefined;
|
|
233
247
|
if (typeof id === 'string' && id.length > 0) {
|
|
@@ -241,7 +255,7 @@ function validateCatalog(catalog, known = manifest_1.KNOWN_CAPABILITIES) {
|
|
|
241
255
|
}
|
|
242
256
|
seen.add(id);
|
|
243
257
|
}
|
|
244
|
-
}
|
|
258
|
+
}
|
|
245
259
|
return findings;
|
|
246
260
|
}
|
|
247
261
|
//# sourceMappingURL=catalog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/validate/catalog.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/validate/catalog.ts"],"names":[],"mappings":"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"}
|
package/src/lib/validate/i18n.js
CHANGED
|
@@ -26,7 +26,7 @@ function validateI18nParity(bundles) {
|
|
|
26
26
|
for (const lang of languages) {
|
|
27
27
|
const keys = keysByLanguage.get(lang);
|
|
28
28
|
for (const key of allKeys) {
|
|
29
|
-
if (!
|
|
29
|
+
if (!keys?.has(key)) {
|
|
30
30
|
findings.push({
|
|
31
31
|
level: 'warning',
|
|
32
32
|
code: 'i18n.missingKey',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/validate/i18n.ts"],"names":[],"mappings":";;AAcA,gDA6BC;AAvCD,SAAS,WAAW,CAAC,MAAkB,EAAE,MAAM,GAAG,EAAE;IAClD,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACrD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;QAC/C,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzE,OAAO,WAAW,CAAC,KAAmB,EAAE,IAAI,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,kBAAkB,CAAC,OAA6C;IAC9E,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACrG,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,KAAK,MAAM,IAAI,IAAI,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC;QAC3C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/validate/i18n.ts"],"names":[],"mappings":";;AAcA,gDA6BC;AAvCD,SAAS,WAAW,CAAC,MAAkB,EAAE,MAAM,GAAG,EAAE;IAClD,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACrD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;QAC/C,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzE,OAAO,WAAW,CAAC,KAAmB,EAAE,IAAI,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,kBAAkB,CAAC,OAA6C;IAC9E,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACrG,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,KAAK,MAAM,IAAI,IAAI,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC;QAC3C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpB,QAAQ,CAAC,IAAI,CAAC;oBACZ,KAAK,EAAE,SAAS;oBAChB,IAAI,EAAE,iBAAiB;oBACvB,OAAO,EAAE,aAAa,IAAI,iCAAiC,GAAG,IAAI;oBAClE,IAAI,EAAE,QAAQ,IAAI,EAAE;iBACrB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|