@kosdev-code/kos-nx-plugin 2.1.23 → 2.1.25
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 +2 -2
- package/src/generators/kos-ui-project/files/.kos.json.template +7 -2
- package/src/generators/kos-ui-project/generator.d.ts.map +1 -1
- package/src/generators/kos-ui-project/generator.js +47 -0
- package/src/generators/kos-ui-project/generator.js.map +1 -1
- package/src/generators/kos-ui-project/schema.d.ts +1 -0
- package/src/generators/kos-ui-project/schema.json +4 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kosdev-code/kos-nx-plugin",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.25",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"generators": "./generators.json",
|
|
6
6
|
"publishConfig": {
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"main": "./src/index.js",
|
|
20
20
|
"kos": {
|
|
21
21
|
"build": {
|
|
22
|
-
"gitHash": "
|
|
22
|
+
"gitHash": "afbdc778ec5af023d94795ca870369860f091414"
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
25
|
}
|
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
{
|
|
2
|
-
"name": "<%= nameDashCase
|
|
3
|
-
"type": "<%= uiType
|
|
2
|
+
"name": "<%= nameDashCase %>",
|
|
3
|
+
"type": "<%= uiType %>",
|
|
4
4
|
"version": "0.0.0-SNAPSHOT",
|
|
5
5
|
"generator": {
|
|
6
6
|
"projectType": "ui"
|
|
7
|
+
},
|
|
8
|
+
"test": {
|
|
9
|
+
"plugin": {
|
|
10
|
+
"context": "<%= nameDashCase %>"
|
|
11
|
+
}
|
|
7
12
|
}
|
|
8
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../../packages/plugins/kos-nx-plugin/src/generators/kos-ui-project/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../../packages/plugins/kos-nx-plugin/src/generators/kos-ui-project/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAIvD,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,2BAA2B,iBA+MrC;AAED,eAAe,qBAAqB,CAAC"}
|
|
@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
|
|
|
5
5
|
const eslint_1 = require("@nx/eslint");
|
|
6
6
|
const react_1 = require("@nx/react");
|
|
7
7
|
const path = require("path");
|
|
8
|
+
const kos_config_helpers_1 = require("../../utils/kos-config-helpers");
|
|
8
9
|
const normalize_value_1 = require("../kos-model/lib/normalize-value");
|
|
9
10
|
async function kosUiProjectGenerator(tree, options) {
|
|
10
11
|
const normalizedOptions = (0, normalize_value_1.normalizeAllValues)({
|
|
@@ -47,6 +48,52 @@ async function kosUiProjectGenerator(tree, options) {
|
|
|
47
48
|
});
|
|
48
49
|
}
|
|
49
50
|
const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, normalized.projectName);
|
|
51
|
+
// Register host with root .kos.json development configuration
|
|
52
|
+
if (tree.exists(".kos.json")) {
|
|
53
|
+
const rootConfigContent = tree.read(".kos.json", "utf-8");
|
|
54
|
+
if (rootConfigContent) {
|
|
55
|
+
const rootConfig = JSON.parse(rootConfigContent);
|
|
56
|
+
if ((0, kos_config_helpers_1.hasDevelopmentConfig)(rootConfig)) {
|
|
57
|
+
// Determine plugin context from options or generate default
|
|
58
|
+
const pluginContext = options.pluginContext || normalized.nameDashCase;
|
|
59
|
+
// Determine UI type for host configuration
|
|
60
|
+
let hostType = "cui";
|
|
61
|
+
if (normalized.uiType.includes("ncui")) {
|
|
62
|
+
hostType = "ncui";
|
|
63
|
+
}
|
|
64
|
+
else if (normalized.uiType.includes("admin")) {
|
|
65
|
+
hostType = "admin";
|
|
66
|
+
}
|
|
67
|
+
// Check if host already exists
|
|
68
|
+
const existingHost = rootConfig.development.hosts.find((h) => h.name === normalized.nameDashCase);
|
|
69
|
+
if (!existingHost) {
|
|
70
|
+
// Calculate next port range - increment by 100 for each new host
|
|
71
|
+
const hostCount = rootConfig.development.hosts.length;
|
|
72
|
+
const nextPortStart = 4200 + hostCount * 100;
|
|
73
|
+
// Add host configuration
|
|
74
|
+
rootConfig.development.hosts.push({
|
|
75
|
+
name: normalized.nameDashCase,
|
|
76
|
+
project: normalized.nameDashCase,
|
|
77
|
+
port: nextPortStart,
|
|
78
|
+
type: hostType,
|
|
79
|
+
pluginContext: pluginContext,
|
|
80
|
+
plugins: [],
|
|
81
|
+
});
|
|
82
|
+
// Add port range
|
|
83
|
+
rootConfig.development.portRanges[normalized.nameDashCase] = {
|
|
84
|
+
start: nextPortStart,
|
|
85
|
+
next: nextPortStart + 1,
|
|
86
|
+
};
|
|
87
|
+
// Write updated .kos.json
|
|
88
|
+
tree.write(".kos.json", JSON.stringify(rootConfig, null, 2) + "\n");
|
|
89
|
+
console.log(`✓ Registered host '${normalized.nameDashCase}' in .kos.json`);
|
|
90
|
+
console.log(` - Port: ${nextPortStart}`);
|
|
91
|
+
console.log(` - Type: ${hostType}`);
|
|
92
|
+
console.log(` - Plugin Context: ${pluginContext}`);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
}
|
|
50
97
|
const archivePath = normalized.directory || "packages";
|
|
51
98
|
const externalJson = {
|
|
52
99
|
kab: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/kos-nx-plugin/src/generators/kos-ui-project/generator.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AACpB,uCAAoC;AACpC,qCAAgE;AAChE,6BAA6B;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/kos-nx-plugin/src/generators/kos-ui-project/generator.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AACpB,uCAAoC;AACpC,qCAAgE;AAChE,6BAA6B;AAE7B,uEAAsE;AAGtE,sEAAsE;AAE/D,KAAK,UAAU,qBAAqB,CACzC,IAAU,EACV,OAAoC;IAEpC,MAAM,iBAAiB,GAAG,IAAA,oCAAkB,EAAC;QAC3C,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC,CAAC;IACH,MAAM,UAAU,GAAG;QACjB,GAAG,iBAAiB;QACpB,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,WAAW,EAAE,OAAO,CAAC,IAAI;QACzB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,QAAQ;KACnC,CAAC;IAEF,MAAM,SAAS,GAAG,GAAG,UAAU,CAAC,YAAY,EAAE,CAAC;IAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;IACtE,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAA,4BAAoB,EAAC,IAAI,EAAE;YAC/B,MAAM,EAAE,IAAI;YACZ,aAAa,EAAE,MAAM;YACrB,SAAS,EAAE,MAAM;YACjB,MAAM,EAAE,eAAM,CAAC,MAAM;YACrB,OAAO,EAAE,MAAM;YACf,cAAc,EAAE,MAAM;YACtB,IAAI,EAAE,GAAG,SAAS,EAAE;YACpB,KAAK,EAAE,iBAAiB;YACxB,wBAAwB,EAAE,aAAa;SACxC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,IAAA,qBAAa,EAAC,IAAI,EAAE;YACxB,MAAM,EAAE,IAAI;YACZ,aAAa,EAAE,MAAM;YACrB,SAAS,EAAE,MAAM;YACjB,MAAM,EAAE,eAAM,CAAC,MAAM;YACrB,cAAc,EAAE,MAAM;YACtB,IAAI,EAAE,GAAG,SAAS,EAAE;YACpB,KAAK,EAAE,iBAAiB;YACxB,OAAO,EAAE,IAAI;YACb,wBAAwB,EAAE,aAAa;SACxC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EACnD,IAAI,EACJ,UAAU,CAAC,WAAW,CACvB,CAAC;IAEF,8DAA8D;IAC9D,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QAC7B,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC1D,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,UAAU,GAAiB,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YAE/D,IAAI,IAAA,yCAAoB,EAAC,UAAU,CAAC,EAAE,CAAC;gBACrC,4DAA4D;gBAC5D,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,UAAU,CAAC,YAAY,CAAC;gBAEvE,2CAA2C;gBAC3C,IAAI,QAAQ,GAAG,KAAK,CAAC;gBACrB,IAAI,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBACvC,QAAQ,GAAG,MAAM,CAAC;gBACpB,CAAC;qBAAM,IAAI,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC/C,QAAQ,GAAG,OAAO,CAAC;gBACrB,CAAC;gBAED,+BAA+B;gBAC/B,MAAM,YAAY,GAAG,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CACpD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,YAAY,CAC1C,CAAC;gBAEF,IAAI,CAAC,YAAY,EAAE,CAAC;oBAClB,iEAAiE;oBACjE,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC;oBACtD,MAAM,aAAa,GAAG,IAAI,GAAG,SAAS,GAAG,GAAG,CAAC;oBAE7C,yBAAyB;oBACzB,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC;wBAChC,IAAI,EAAE,UAAU,CAAC,YAAY;wBAC7B,OAAO,EAAE,UAAU,CAAC,YAAY;wBAChC,IAAI,EAAE,aAAa;wBACnB,IAAI,EAAE,QAAQ;wBACd,aAAa,EAAE,aAAa;wBAC5B,OAAO,EAAE,EAAE;qBACZ,CAAC,CAAC;oBAEH,iBAAiB;oBACjB,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG;wBAC3D,KAAK,EAAE,aAAa;wBACpB,IAAI,EAAE,aAAa,GAAG,CAAC;qBACxB,CAAC;oBAEF,0BAA0B;oBAC1B,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;oBAEpE,OAAO,CAAC,GAAG,CACT,sBAAsB,UAAU,CAAC,YAAY,gBAAgB,CAC9D,CAAC;oBACF,OAAO,CAAC,GAAG,CAAC,aAAa,aAAa,EAAE,CAAC,CAAC;oBAC1C,OAAO,CAAC,GAAG,CAAC,aAAa,QAAQ,EAAE,CAAC,CAAC;oBACrC,OAAO,CAAC,GAAG,CAAC,uBAAuB,aAAa,EAAE,CAAC,CAAC;gBACtD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,WAAW,GAAG,UAAU,CAAC,SAAS,IAAI,UAAU,CAAC;IACvD,MAAM,YAAY,GAAQ;QACxB,GAAG,EAAE;YACH,OAAO,EAAE,wCAAwC,UAAU,CAAC,YAAY,2CAA2C,UAAU,CAAC,YAAY,GAAG;YAC7I,OAAO,EAAE;gBACP,UAAU,EAAE,iBAAiB,WAAW,IAAI,UAAU,CAAC,YAAY,GAAG;gBACtE,OAAO,EAAE,QAAQ;gBACjB,OAAO,EAAE,GAAG,UAAU,CAAC,YAAY,MAAM;aAC1C;YACD,SAAS,EAAE,CAAC,KAAK,CAAC;SACnB;QACD,GAAG,EAAE;YACH,OAAO,EAAE,kCAAkC,UAAU,CAAC,YAAY,EAAE;YACpE,OAAO,EAAE;gBACP,UAAU,EAAE,iBAAiB,WAAW,IAAI,UAAU,CAAC,YAAY,GAAG;gBACtE,OAAO,EAAE,QAAQ;aAClB;YACD,SAAS,EAAE,CAAC,OAAO,CAAC;SACrB;QACD,UAAU,EAAE;YACV,OAAO,EAAE,qCAAqC,SAAS,EAAE;YACzD,OAAO,EAAE;gBACP,UAAU,EAAE,aAAa,SAAS,EAAE;gBACpC,QAAQ,EAAE,iBAAiB;aAC5B;YACD,SAAS,EAAE,CAAC,OAAO,CAAC;SACrB;KACF,CAAC;IAEF,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,YAAY,CAAC,OAAO,GAAG;YACrB,OAAO,EAAE,iCAAiC,UAAU,CAAC,YAAY,EAAE;YACnE,OAAO,EAAE;gBACP,UAAU,EAAE,4BAA4B;gBACxC,OAAO,EAAE,iBAAiB,WAAW,IAAI,UAAU,CAAC,YAAY,EAAE;gBAClE,OAAO,EAAE,GAAG,UAAU,CAAC,YAAY,MAAM;aAC1C;YACD,SAAS,EAAE,CAAC,KAAK,CAAC;SACnB,CAAC;IACJ,CAAC;IACD,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,oBAAoB,CAAC,IAAI,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;QACrE,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,CAAC,OAAO;YACf,GAAG,YAAY;YACf,KAAK,EAAE;gBACL,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK;gBACrB,OAAO,EAAE;oBACP,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO;oBAC7B,QAAQ,EAAE,IAAI;iBACf;gBACD,cAAc,EAAE;oBACd,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc;oBACpC,WAAW,EAAE;wBACX,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW;wBAChD,QAAQ,EAAE,GAAG;qBACd;iBACF;aACF;SACF,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,oBAAoB,CAAC,IAAI,EACzB,UAAU,CACX,CAAC;IAEF,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,EAChC,oBAAoB,CAAC,IAAI,EACzB,UAAU,CACX,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,oBAAoB,CAAC,IAAI,oBAAoB,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,IAAA,qCAA4B,EAC1B,IAAI,EACJ;YACE,sBAAsB,EAAE,QAAQ;YAChC,iCAAiC,EAAE,QAAQ;YAC3C,uCAAuC,EAAE,QAAQ;YACjD,6BAA6B,EAAE,QAAQ;YACvC,6BAA6B,EAAE,QAAQ;YACvC,4BAA4B,EAAE,QAAQ;YACtC,0BAA0B,EAAE,QAAQ;YACpC,yBAAyB,EAAE,QAAQ;YACnC,4BAA4B,EAAE,QAAQ;SACvC,EACD,EAAE,CACH,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,GAAG,oBAAoB,CAAC,IAAI,yBAAyB,CAAC,CAAC;IACnE,IAAI,CAAC,MAAM,CAAC,GAAG,oBAAoB,CAAC,IAAI,eAAe,CAAC,CAAC;IACzD,IAAI,CAAC,MAAM,CAAC,GAAG,oBAAoB,CAAC,IAAI,uBAAuB,CAAC,CAAC;IACjE,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAjND,sDAiNC;AAED,kBAAe,qBAAqB,CAAC"}
|
|
@@ -28,6 +28,10 @@
|
|
|
28
28
|
"type": "string",
|
|
29
29
|
"description": "KAB type of UI",
|
|
30
30
|
"default": "kos.ui"
|
|
31
|
+
},
|
|
32
|
+
"pluginContext": {
|
|
33
|
+
"type": "string",
|
|
34
|
+
"description": "Plugin context group identifier for compatible plugins (e.g., 'kosdev.ddk', 'cui')"
|
|
31
35
|
}
|
|
32
36
|
},
|
|
33
37
|
"required": ["name"]
|