@spartan-ng/cli 0.0.1-alpha.714 → 0.0.1-alpha.716
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/healthcheck/generator.js +7 -2
- package/src/generators/healthcheck/generator.js.map +1 -1
- package/src/generators/healthcheck/healthchecks/version.js +19 -8
- package/src/generators/healthcheck/healthchecks/version.js.map +1 -1
- package/src/generators/healthcheck/utils/runner.js +9 -1
- package/src/generators/healthcheck/utils/runner.js.map +1 -1
- package/src/generators/migrate-helm-libraries/generator.js +0 -4
- package/src/generators/migrate-helm-libraries/generator.js.map +1 -1
- package/src/generators/migrate-hlm/generator.js +2 -1
- package/src/generators/migrate-hlm/generator.js.map +1 -1
- package/src/generators/migrate-module-imports/import-map.js +1 -1
- package/src/generators/ui/libs/avatar/files/lib/hlm-avatar-fallback.ts.template +1 -1
- package/src/generators/ui/libs/avatar/files/lib/hlm-avatar-image.ts.template +1 -1
- package/src/generators/ui/libs/breadcrumb/files/index.ts.template +0 -5
- package/src/generators/ui/libs/calendar/files/lib/hlm-calendar-multi.ts.template +1 -0
- package/src/generators/ui/libs/calendar/files/lib/hlm-calendar-range.ts.template +1 -0
- package/src/generators/ui/libs/calendar/files/lib/hlm-calendar.ts.template +1 -0
- package/src/generators/ui/libs/command/files/lib/hlm-command-dialog.ts.template +2 -2
- package/src/generators/ui/libs/command/files/lib/hlm-command-empty.ts.template +1 -1
- package/src/generators/ui/libs/command/files/lib/hlm-command-group-label.ts.template +1 -1
- package/src/generators/ui/libs/command/files/lib/hlm-command-group.ts.template +1 -1
- package/src/generators/ui/libs/command/files/lib/hlm-command-input.ts.template +7 -6
- package/src/generators/ui/libs/command/files/lib/hlm-command-item.ts.template +1 -1
- package/src/generators/ui/libs/command/files/lib/hlm-command-list.ts.template +1 -1
- package/src/generators/ui/libs/command/files/lib/hlm-command-separator.ts.template +1 -1
- package/src/generators/ui/libs/command/files/lib/hlm-command-shortcut.ts.template +1 -1
- package/src/generators/ui/libs/command/files/lib/hlm-command.ts.template +1 -1
- package/src/generators/ui/libs/context-menu/files/lib/hlm-context-menu-trigger.ts.template +3 -0
- package/src/generators/ui/libs/dropdown-menu/files/index.ts.template +3 -0
- package/src/generators/ui/libs/dropdown-menu/files/lib/hlm-dropdown-menu-checkbox-indicator.ts.template +3 -2
- package/src/generators/ui/libs/dropdown-menu/files/lib/hlm-dropdown-menu-checkbox.ts.template +30 -10
- package/src/generators/ui/libs/dropdown-menu/files/lib/hlm-dropdown-menu-group.ts.template +1 -3
- package/src/generators/ui/libs/dropdown-menu/files/lib/hlm-dropdown-menu-item-sub-indicator.ts.template +2 -2
- package/src/generators/ui/libs/dropdown-menu/files/lib/hlm-dropdown-menu-item.ts.template +1 -1
- package/src/generators/ui/libs/dropdown-menu/files/lib/hlm-dropdown-menu-label.ts.template +4 -4
- package/src/generators/ui/libs/dropdown-menu/files/lib/hlm-dropdown-menu-radio-indicator.ts.template +5 -4
- package/src/generators/ui/libs/dropdown-menu/files/lib/hlm-dropdown-menu-radio.ts.template +24 -9
- package/src/generators/ui/libs/dropdown-menu/files/lib/hlm-dropdown-menu-separator.ts.template +2 -4
- package/src/generators/ui/libs/dropdown-menu/files/lib/hlm-dropdown-menu-shortcut.ts.template +2 -4
- package/src/generators/ui/libs/dropdown-menu/files/lib/hlm-dropdown-menu-sub-trigger.ts.template +44 -0
- package/src/generators/ui/libs/dropdown-menu/files/lib/hlm-dropdown-menu-sub.ts.template +1 -4
- package/src/generators/ui/libs/dropdown-menu/files/lib/hlm-dropdown-menu-trigger.ts.template +1 -3
- package/src/generators/ui/libs/dropdown-menu/files/lib/hlm-dropdown-menu.ts.template +1 -1
- package/src/generators/ui/libs/input/files/lib/hlm-input.ts.template +1 -0
- package/src/generators/ui/libs/menubar/files/lib/hlm-menubar-trigger.ts.template +1 -1
- package/src/generators/ui/libs/menubar/files/lib/hlm-menubar.ts.template +1 -1
- package/src/generators/ui/libs/native-select/files/lib/hlm-native-select-opt-group.ts.template +7 -2
- package/src/generators/ui/libs/native-select/files/lib/hlm-native-select-option.ts.template +7 -2
- package/src/generators/ui/libs/popover/files/lib/hlm-popover-content.ts.template +1 -0
- package/src/generators/ui/libs/popover/files/lib/hlm-popover.ts.template +1 -0
- package/src/generators/ui/libs/progress/files/lib/hlm-progress-indicator.ts.template +5 -1
- package/src/generators/ui/libs/progress/files/lib/hlm-progress.ts.template +1 -0
- package/src/generators/ui/libs/switch/files/lib/hlm-switch-thumb.ts.template +1 -0
- package/src/generators/ui/libs/switch/files/lib/hlm-switch.ts.template +1 -0
- package/src/generators/ui/primitive-deps.js +1 -0
- package/src/generators/ui/primitive-deps.js.map +1 -1
- package/src/generators/ui/primitives.d.ts +1 -1
- package/src/generators/ui/style-luma.css +13 -128
- package/src/generators/ui/style-lyra.css +11 -126
- package/src/generators/ui/style-maia.css +12 -127
- package/src/generators/ui/style-mira.css +11 -126
- package/src/generators/ui/style-nova.css +13 -128
- package/src/generators/ui/style-vega.css +14 -129
- package/src/generators/ui/supported-ui-libraries.json +42 -42
- package/src/utils/config.js +6 -6
- package/src/utils/config.js.map +1 -1
- package/src/utils/version-utils.js +2 -2
- package/src/utils/version-utils.js.map +1 -1
- package/src/generators/healthcheck/utils/prompt.d.ts +0 -1
- package/src/generators/healthcheck/utils/prompt.js +0 -23
- package/src/generators/healthcheck/utils/prompt.js.map +0 -1
package/package.json
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.healthcheckGenerator = healthcheckGenerator;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const enquirer_1 = require("enquirer");
|
|
5
6
|
const config_1 = require("../../utils/config");
|
|
6
7
|
const healthchecks_1 = require("./healthchecks");
|
|
7
8
|
const brain_imports_1 = require("./healthchecks/brain-imports");
|
|
@@ -32,7 +33,6 @@ const module_imports_1 = require("./healthchecks/module-imports");
|
|
|
32
33
|
const naming_conventions_1 = require("./healthchecks/naming-conventions");
|
|
33
34
|
const sonner_1 = require("./healthchecks/sonner");
|
|
34
35
|
const version_1 = require("./healthchecks/version");
|
|
35
|
-
const prompt_1 = require("./utils/prompt");
|
|
36
36
|
const reporter_1 = require("./utils/reporter");
|
|
37
37
|
const runner_1 = require("./utils/runner");
|
|
38
38
|
async function healthcheckGenerator(tree, options) {
|
|
@@ -78,7 +78,12 @@ async function healthcheckGenerator(tree, options) {
|
|
|
78
78
|
}
|
|
79
79
|
for (const report of failedReports) {
|
|
80
80
|
if (report.fixable && (0, healthchecks_1.isHealthcheckFixable)(report.healthcheck)) {
|
|
81
|
-
const fix = options.autoFix ||
|
|
81
|
+
const fix = options.autoFix ||
|
|
82
|
+
(await (0, enquirer_1.prompt)({
|
|
83
|
+
type: 'confirm',
|
|
84
|
+
name: 'confirmed',
|
|
85
|
+
message: report.healthcheck.prompt,
|
|
86
|
+
})).confirmed;
|
|
82
87
|
if (fix) {
|
|
83
88
|
await report.healthcheck.fix(tree, { angularCli: options.angularCli, importAlias });
|
|
84
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/healthcheck/generator.ts"],"names":[],"mappings":";;AAoCA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/healthcheck/generator.ts"],"names":[],"mappings":";;AAoCA,oDAoEC;AAxGD,uCAA4D;AAC5D,uCAAkC;AAClC,+CAAoD;AACpD,iDAAmH;AACnH,gEAAuE;AACvE,gFAAwF;AACxF,wGAAiG;AACjG,oEAA6E;AAC7E,wDAAiE;AACjE,0DAAiE;AACjE,gEAAyE;AACzE,oGAA6F;AAC7F,0DAAmE;AACnE,sEAA8E;AAC9E,0EAAiF;AACjF,8DAAqE;AACrE,8DAAqE;AACrE,4CAA0D;AAC1D,oEAAuE;AACvE,0DAAkE;AAClE,wEAA+E;AAC/E,kEAAyE;AACzE,sDAA8D;AAC9D,8DAAoE;AACpE,sDAA8D;AAC9D,8DAAkE;AAClE,oEAAuE;AACvE,0DAA8D;AAC9D,kEAAyE;AACzE,0EAAgF;AAChF,kDAA0D;AAC1D,oDAA4D;AAE5D,+CAA+C;AAC/C,2CAAgD;AAEzC,KAAK,UAAU,oBAAoB,CAAC,IAAU,EAAE,OAA8D;IACpH,eAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAEvC,MAAM,YAAY,GAAkB;QACnC,4BAAkB;QAClB,uCAAuB;QACvB,qCAAsB;QACtB,8BAAmB;QACnB,uCAAqB;QACrB,iCAAqB;QACrB,8BAAiB;QACjB,8CAA2B;QAC3B,qCAAsB;QACtB,gDAA2B;QAC3B,uCAAqB;QACrB,oCAAqB;QACrB,kCAAmB;QACnB,0BAAoB;QACpB,yCAAyB;QACzB,iEAA6B;QAC7B,6DAA2B;QAC3B,wDAAgC;QAChC,yCAAwB;QACxB,mCAAsB;QACtB,iDAA4B;QAC5B,6CAA2B;QAC3B,8BAAmB;QACnB,kCAAqB;QACrB,+CAA2B;QAC3B,yCAAwB;QACxB,0BAAiB;QACjB,iCAAoB;KACpB,CAAC;IAEF,MAAM,aAAa,GAAwB,EAAE,CAAC;IAE9C,MAAM,WAAW,GAAG,MAAM,IAAA,uBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAEnE,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAc,EAAC,IAAI,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QACpE,IAAA,sBAAW,EAAC,MAAM,CAAC,CAAC;QAEpB,IAAI,MAAM,CAAC,MAAM,KAAK,gCAAiB,CAAC,OAAO,EAAE,CAAC;YACjD,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE,CAAC;QACpC,IAAI,MAAM,CAAC,OAAO,IAAI,IAAA,mCAAoB,EAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;YAChE,MAAM,GAAG,GACR,OAAO,CAAC,OAAO;gBACf,CACC,MAAM,IAAA,iBAAM,EAAyB;oBACpC,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM;iBAClC,CAAC,CACF,CAAC,SAAS,CAAC;YAEb,IAAI,GAAG,EAAE,CAAC;gBACT,MAAM,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;YACrF,CAAC;QACF,CAAC;IACF,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACzB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACzB,CAAC;AACF,CAAC;AAED,kBAAe,oBAAoB,CAAC"}
|
|
@@ -25,12 +25,11 @@ exports.versionHealthcheck = {
|
|
|
25
25
|
}
|
|
26
26
|
const installedVersion = dependencies[dep];
|
|
27
27
|
// check if the installed version is the latest version
|
|
28
|
-
const
|
|
29
|
-
if (!
|
|
28
|
+
const metadata = await fetchLatestMetadata(dep);
|
|
29
|
+
if (!metadata) {
|
|
30
30
|
failure(`Failed to fetch metadata for ${dep}.`, healthchecks_1.HealthcheckSeverity.Error, false);
|
|
31
31
|
continue;
|
|
32
32
|
}
|
|
33
|
-
const metadata = (await request.json());
|
|
34
33
|
if (!semver.satisfies(metadata.version, installedVersion)) {
|
|
35
34
|
failure(`The installed version of ${dep} is not the latest version. The latest version is ${metadata.version}.`, healthchecks_1.HealthcheckSeverity.Warning, true);
|
|
36
35
|
continue;
|
|
@@ -45,16 +44,15 @@ exports.versionHealthcheck = {
|
|
|
45
44
|
if (!dependencies[dep]) {
|
|
46
45
|
return false;
|
|
47
46
|
}
|
|
48
|
-
const
|
|
49
|
-
if (!
|
|
47
|
+
const metadata = await fetchLatestMetadata(dep);
|
|
48
|
+
if (!metadata) {
|
|
50
49
|
return false;
|
|
51
50
|
}
|
|
52
|
-
const metadata = (await request.json());
|
|
53
51
|
// update the dependency to the latest version in the respective section
|
|
54
|
-
if (packageJson.dependencies[dep]) {
|
|
52
|
+
if (packageJson.dependencies?.[dep]) {
|
|
55
53
|
packageJson.dependencies[dep] = `^${metadata.version}`;
|
|
56
54
|
}
|
|
57
|
-
else {
|
|
55
|
+
else if (packageJson.devDependencies?.[dep]) {
|
|
58
56
|
packageJson.devDependencies[dep] = `^${metadata.version}`;
|
|
59
57
|
}
|
|
60
58
|
}
|
|
@@ -63,4 +61,17 @@ exports.versionHealthcheck = {
|
|
|
63
61
|
},
|
|
64
62
|
prompt: 'Would you like to update to the latest versions of the dependencies?',
|
|
65
63
|
};
|
|
64
|
+
async function fetchLatestMetadata(dep) {
|
|
65
|
+
try {
|
|
66
|
+
const request = await fetch(`https://registry.npmjs.org/${dep}/latest`);
|
|
67
|
+
if (!request.ok) {
|
|
68
|
+
return null;
|
|
69
|
+
}
|
|
70
|
+
return (await request.json());
|
|
71
|
+
}
|
|
72
|
+
catch {
|
|
73
|
+
// offline, DNS failure, timeout, malformed JSON - treat as "could not determine latest"
|
|
74
|
+
return null;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
66
77
|
//# sourceMappingURL=version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/healthcheck/healthchecks/version.ts"],"names":[],"mappings":";;;;AAAA,uCAAsC;AAEtC,uDAAiC;AACjC,kDAAwE;AAE3D,QAAA,kBAAkB,GAAgB;IAC9C,IAAI,EAAE,4BAA4B;IAClC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI;QAC/B,qDAAqD;QACrD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YAC/B,OAAO;QACR,CAAC;QAED,wBAAwB;QACxB,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEnD,6CAA6C;QAC7C,MAAM,YAAY,GAAG,EAAE,GAAG,WAAW,CAAC,YAAY,EAAE,GAAG,WAAW,CAAC,eAAe,EAAE,CAAC;QAErF,MAAM,mBAAmB,GAAG,CAAC,mBAAmB,EAAE,iBAAiB,CAAC,CAAC;QAErE,KAAK,MAAM,GAAG,IAAI,mBAAmB,EAAE,CAAC;YACvC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxB,OAAO,CAAC,kBAAkB,GAAG,oBAAoB,EAAE,kCAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gBACpF,SAAS;YACV,CAAC;YAED,MAAM,gBAAgB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;YAE3C,uDAAuD;YACvD,MAAM,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/healthcheck/healthchecks/version.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,15 @@ async function runHealthcheck(tree, healthcheck, importAlias) {
|
|
|
23
23
|
report.status = healthchecks_1.HealthcheckStatus.Skipped;
|
|
24
24
|
report.reason = reason;
|
|
25
25
|
};
|
|
26
|
-
|
|
26
|
+
try {
|
|
27
|
+
await coercePromise(healthcheck.detect(tree, failure, skip, { importAlias }));
|
|
28
|
+
}
|
|
29
|
+
catch (error) {
|
|
30
|
+
// A single check throwing (a parse error, a network failure, a malformed file) must not abort
|
|
31
|
+
// the remaining healthchecks - surface it as a failure and keep going.
|
|
32
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
33
|
+
failure(`Healthcheck threw an unexpected error: ${message}`, healthchecks_1.HealthcheckSeverity.Error, false);
|
|
34
|
+
}
|
|
27
35
|
return report;
|
|
28
36
|
}
|
|
29
37
|
function coercePromise(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/healthcheck/utils/runner.ts"],"names":[],"mappings":";;AAUA,
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/healthcheck/utils/runner.ts"],"names":[],"mappings":";;AAUA,wCAuCC;AAhDD,kDAOyB;AAElB,KAAK,UAAU,cAAc,CACnC,IAAU,EACV,WAAwB,EACxB,WAAmB;IAEnB,MAAM,MAAM,GAAsB;QACjC,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,MAAM,EAAE,gCAAiB,CAAC,OAAO;QACjC,OAAO,EAAE,KAAK;QACd,WAAW;KACX,CAAC;IAEF,MAAM,OAAO,GAAyB,CAAC,OAAe,EAAE,QAA6B,EAAE,OAAgB,EAAE,EAAE;QAC1G,qCAAqC;QACrC,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,KAAK,OAAO,CAAC,EAAE,CAAC;YAC/D,OAAO;QACR,CAAC;QAED,MAAM,CAAC,MAAM,GAAG,gCAAiB,CAAC,OAAO,CAAC;QAC1C,MAAM,CAAC,MAAM,KAAK,EAAE,CAAC;QACrB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC1C,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,CAAC,OAAO,IAAI,IAAA,mCAAoB,EAAC,WAAW,CAAC,CAAC,CAAC;IACnF,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,CAAC,MAAc,EAAE,EAAE;QAC/B,MAAM,CAAC,MAAM,GAAG,gCAAiB,CAAC,OAAO,CAAC;QAC1C,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;IACxB,CAAC,CAAC;IAEF,IAAI,CAAC;QACJ,MAAM,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IAC/E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,8FAA8F;QAC9F,uEAAuE;QACvE,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,OAAO,CAAC,0CAA0C,OAAO,EAAE,EAAE,kCAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChG,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,aAAa,CAAI,KAAqB;IAC9C,OAAO,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAClE,CAAC"}
|
|
@@ -56,10 +56,6 @@ async function migrateHelmLibrariesGenerator(tree, options) {
|
|
|
56
56
|
devkit_1.logger.info('No libraries to migrate');
|
|
57
57
|
return;
|
|
58
58
|
}
|
|
59
|
-
// if we are running in Jest we can't use the enquirer prompt
|
|
60
|
-
if (process.env.JEST_WORKER_ID) {
|
|
61
|
-
return;
|
|
62
|
-
}
|
|
63
59
|
// allow the user to select which libraries to migrate
|
|
64
60
|
const selectedLibraries = await (0, enquirer_1.prompt)({
|
|
65
61
|
type: 'multiselect',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-helm-libraries/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkBA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-helm-libraries/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkBA,sEAyDC;AA3ED,uCAAkF;AAClF,+BAAmD;AACnD,4FAA4F;AAC5F,2FAA2F;AAC3F,2FAA2F;AAC3F,mFAAmF;AACnF,4FAA4F;AAC5F,uEAA6E;AAC7E,uCAAkC;AAClC,+BAAqC;AACrC,+CAAuD;AACvD,mDAAiE;AACjE,yDAAsD;AAEtD,+CAA2D;AAIpD,KAAK,UAAU,6BAA6B,CAAC,IAAU,EAAE,OAA4C;IAC3G,kDAAkD;IAElD,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAiB,EAAC,IAAI,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAEjF,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAE1E,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpC,eAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACvC,OAAO;IACR,CAAC;IAED,sDAAsD;IACtD,MAAM,iBAAiB,GAAG,MAAM,IAAA,iBAAM,EAAC;QACtC,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,qGAAqG;QAC9G,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,iBAAiB,CAAC;KACtC,CAAC,CAAC;IAEH,uHAAuH;IACvH,MAAM,YAAY,GAAG,CAAC,MAAM,IAAA,iBAAM,EAAC;QAClC,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;QACf,OAAO,EACN,mIAAmI;KACpI,CAAC,CAAyB,CAAC;IAE5B,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAC3B,eAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACnC,OAAO;IACR,CAAC;IAED,IAAI,EAAE,SAAS,EAAE,GAAG,iBAAyD,CAAC;IAE9E,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,eAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAC7C,OAAO;IACR,CAAC;IAED,uEAAuE;IACvE,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/B,SAAS,GAAG,iBAAiB,CAAC;IAC/B,CAAC;IAED,MAAM,uBAAuB,CAC5B,IAAI,EACJ,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,EAC9E,SAAwB,CACxB,CAAC;IACF,MAAM,mBAAmB,CACxB,IAAI,EACJ,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,EAC1E,SAAwB,CACxB,CAAC;IAEF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;AACzB,CAAC;AAED,kBAAe,6BAA6B,CAAC;AAE7C,KAAK,UAAU,eAAe,CAAC,IAAU,EAAE,WAAmB;IAC7D,MAAM,kBAAkB,GAAG,CAAC,MAAM,kDAAO,mCAAmC,IAAE,IAAI,CACjF,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAChB,CAAuB,CAAC;IACzB,MAAM,aAAa,GAAG,IAAA,oCAAyB,EAAC,IAAI,CAAC,CAAC;IAEtD,8CAA8C;IAC9C,MAAM,iBAAiB,GAAgB,EAAE,CAAC;IAE1C,KAAK,MAAM,WAAW,IAAI,kBAAkB,EAAE,CAAC;QAC9C,IAAI,aAAa,CAAC,kBAAkB,WAAW,OAAO,CAAC,EAAE,CAAC;YACzD,iBAAiB,CAAC,IAAI,CAAC,WAAwB,CAAC,CAAC;QAClD,CAAC;aAAM,IAAI,aAAa,CAAC,kBAAkB,WAAW,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;YACpF,iBAAiB,CAAC,IAAI,CAAC,WAAwB,CAAC,CAAC;QAClD,CAAC;aAAM,IAAI,aAAa,CAAC,oBAAoB,WAAW,EAAE,CAAC,EAAE,CAAC;YAC7D,iBAAiB,CAAC,IAAI,CAAC,WAAwB,CAAC,CAAC;QAClD,CAAC;aAAM,IAAI,aAAa,CAAC,GAAG,WAAW,IAAI,WAAW,EAAE,CAAC,EAAE,CAAC;YAC3D,iBAAiB,CAAC,IAAI,CAAC,WAAwB,CAAC,CAAC;QAClD,CAAC;IACF,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC1B,CAAC;AAED,KAAK,UAAU,uBAAuB,CACrC,IAAU,EACV,OAA4C,EAC5C,SAAsB;IAEtB,MAAM,aAAa,GAAG,IAAA,oCAAyB,EAAC,IAAI,CAAC,CAAC;IAEtD,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE,CAAC;QACjC,6BAA6B;QAC7B,IAAI,UAAkB,CAAC;QACvB,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAE7D,IAAI,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,EAAE,IAAI,aAAa,EAAE,CAAC;YAC1D,UAAU,GAAG,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,EAAE,CAAC;QAClD,CAAC;aAAM,IAAI,oBAAoB,OAAO,EAAE,IAAI,aAAa,EAAE,CAAC;YAC3D,UAAU,GAAG,oBAAoB,OAAO,EAAE,CAAC;QAC5C,CAAC;aAAM,IAAI,kBAAkB,OAAO,OAAO,IAAI,aAAa,EAAE,CAAC;YAC9D,UAAU,GAAG,kBAAkB,OAAO,OAAO,CAAC;QAC/C,CAAC,CAAC,oGAAoG;aACjG,IAAI,kBAAkB,aAAa,OAAO,IAAI,aAAa,EAAE,CAAC;YAClE,UAAU,GAAG,kBAAkB,aAAa,OAAO,CAAC;QACrD,CAAC;QAED,wCAAwC;QAExC,MAAM,YAAY,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;QAE/C,IAAI,CAAC,YAAY,IAAI,CAAC,UAAU,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,4CAA4C,OAAO,EAAE,CAAC,CAAC;QACxE,CAAC;QAED,4EAA4E;QAC5E,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAE7B,0EAA0E;QAC1E,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7D,0EAA0E;YAC1E,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACxD,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC;YAC1D,IAAI,WAA+B,CAAC;YAEpC,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;gBAClC,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;gBACpD,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC;YAChC,CAAC;YAED,IAAI,CAAC,WAAW,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,gDAAgD,OAAO,yBAAyB,WAAW,EAAE,CAAC,CAAC;YAChH,CAAC;YAED,MAAM,IAAA,wBAAe,EAAC,IAAI,EAAE;gBAC3B,WAAW;gBACX,WAAW,EAAE,IAAI;gBACjB,UAAU,EAAE,IAAI;gBAChB,UAAU;aACV,CAAC,CAAC;QACJ,CAAC;aAAM,CAAC;YACP,gFAAgF;YAChF,+GAA+G;YAC/G,wBAAwB;YACxB,MAAM,SAAS,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAEtD,gDAAgD;YAChD,IAAA,yBAAW,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAE7B,oCAAoC;YACpC,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,8BAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC1D,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBAC9C,OAAO,IAAI,CAAC;YACb,CAAC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;AACF,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,IAAU,EAAE,OAA4C,EAAE,SAAsB;IAClH,MAAM,kBAAkB,GAAG,CAAC,MAAM,kDAAO,mCAAmC,IAAE,IAAI,CACjF,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAChB,CAAuB,CAAC;IACzB,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAiB,EAAC,IAAI,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAEjF,MAAM,IAAA,oCAAwB,EAC7B;QACC,UAAU,EAAE,SAAS;KACrB,EACD,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAgB,EAC9C,kBAAkB,EAClB,IAAI,EACJ,EAAE,GAAG,OAAO,EAAE,uBAAuB,EAAE,KAAK,EAAE,EAC9C,MAAM,CACN,CAAC;AACH,CAAC"}
|
|
@@ -54,7 +54,8 @@ async function ensureHelmUtilsInstalled(tree, angularCli) {
|
|
|
54
54
|
if (!tsconfigPath) {
|
|
55
55
|
throw new Error('Could not find tsconfig.base.json or tsconfig.json to verify @spartan-ng/helm/utils.');
|
|
56
56
|
}
|
|
57
|
-
|
|
57
|
+
// readJson tolerates JSONC (comments / trailing commas), which real tsconfig files often contain.
|
|
58
|
+
const tsconfig = (0, devkit_1.readJson)(tree, tsconfigPath);
|
|
58
59
|
// Check compilerOptions.paths for @spartan-ng/helm/utils
|
|
59
60
|
const paths = tsconfig.compilerOptions?.paths || {};
|
|
60
61
|
const hasHelmUtils = Object.keys(paths).some((pkg) => pkg === '@spartan-ng/helm/utils');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-hlm/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,kDAOC;AAfD,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-hlm/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,7 @@ exports.default = {
|
|
|
40
40
|
HlmAutocompleteModule: 'HlmAutocompleteImports',
|
|
41
41
|
HlmAvatarModule: 'HlmAvatarImports',
|
|
42
42
|
HlmBadgeModule: 'HlmBadgeImports',
|
|
43
|
-
HlmBreadCrumbModule: '
|
|
43
|
+
HlmBreadCrumbModule: 'HlmBreadcrumbImports',
|
|
44
44
|
HlmButtonModule: 'HlmButtonImports',
|
|
45
45
|
HlmCalendarModule: 'HlmCalendarImports',
|
|
46
46
|
HlmCardModule: 'HlmCardImports',
|
|
@@ -25,6 +25,7 @@ import type { ClassValue } from 'clsx';
|
|
|
25
25
|
imports: [BrnCalendarImports, NgIcon, HlmIcon, NgTemplateOutlet, HlmSelectImports],
|
|
26
26
|
viewProviders: [provideIcons({ lucideChevronLeft, lucideChevronRight })],
|
|
27
27
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
28
|
+
host: { 'data-slot': 'calendar' },
|
|
28
29
|
template: `
|
|
29
30
|
<div
|
|
30
31
|
brnCalendarMulti
|
|
@@ -25,6 +25,7 @@ import type { ClassValue } from 'clsx';
|
|
|
25
25
|
imports: [BrnCalendarImports, NgIcon, HlmIcon, HlmSelectImports, NgTemplateOutlet],
|
|
26
26
|
viewProviders: [provideIcons({ lucideChevronLeft, lucideChevronRight })],
|
|
27
27
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
28
|
+
host: { 'data-slot': 'calendar' },
|
|
28
29
|
template: `
|
|
29
30
|
<div
|
|
30
31
|
brnCalendarRange
|
|
@@ -25,6 +25,7 @@ import type { ClassValue } from 'clsx';
|
|
|
25
25
|
imports: [BrnCalendarImports, NgIcon, HlmIcon, HlmSelectImports, NgTemplateOutlet],
|
|
26
26
|
viewProviders: [provideIcons({ lucideChevronLeft, lucideChevronRight })],
|
|
27
27
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
28
|
+
host: { 'data-slot': 'calendar' },
|
|
28
29
|
template: `
|
|
29
30
|
<div
|
|
30
31
|
brnCalendar
|
|
@@ -8,14 +8,14 @@ import {
|
|
|
8
8
|
linkedSignal,
|
|
9
9
|
output,
|
|
10
10
|
} from '@angular/core';
|
|
11
|
-
import {
|
|
11
|
+
import { BrnDialogState } from '@spartan-ng/brain/dialog';
|
|
12
12
|
import { HlmDialogImports } from '<%- importAlias %>/dialog';
|
|
13
13
|
import { hlm } from '<%- importAlias %>/utils';
|
|
14
14
|
import { ClassValue } from 'clsx';
|
|
15
15
|
|
|
16
16
|
@Component({
|
|
17
17
|
selector: 'hlm-command-dialog',
|
|
18
|
-
imports: [HlmDialogImports
|
|
18
|
+
imports: [HlmDialogImports],
|
|
19
19
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
20
20
|
template: `
|
|
21
21
|
<hlm-dialog [state]="_state()" (stateChanged)="stateChanged($event)">
|
|
@@ -16,6 +16,6 @@ import { classes } from '<%- importAlias %>/utils';
|
|
|
16
16
|
})
|
|
17
17
|
export class HlmCommandGroup {
|
|
18
18
|
constructor() {
|
|
19
|
-
classes(() => '
|
|
19
|
+
classes(() => 'spartan-command-group block data-hidden:hidden');
|
|
20
20
|
}
|
|
21
21
|
}
|
|
@@ -10,20 +10,21 @@ import { classes } from '<%- importAlias %>/utils';
|
|
|
10
10
|
imports: [HlmInputGroupImports, NgIcon, BrnCommandInput],
|
|
11
11
|
providers: [provideIcons({ lucideSearch })],
|
|
12
12
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
13
|
+
host: {
|
|
14
|
+
'data-slot': 'command-input-wrapper',
|
|
15
|
+
},
|
|
13
16
|
template: `
|
|
14
|
-
<hlm-input-group
|
|
15
|
-
class="bg-input/30 border-input/30 h-8 rounded-lg shadow-none *:data-[slot=input-group-addon]:pl-2"
|
|
16
|
-
>
|
|
17
|
+
<hlm-input-group class="spartan-command-input-group">
|
|
17
18
|
<input
|
|
18
19
|
brnCommandInput
|
|
19
20
|
data-slot="command-input"
|
|
20
|
-
class="
|
|
21
|
+
class="spartan-command-input outline-hidden disabled:cursor-not-allowed disabled:opacity-50"
|
|
21
22
|
[id]="inputId()"
|
|
22
23
|
[placeholder]="placeholder()"
|
|
23
24
|
/>
|
|
24
25
|
|
|
25
26
|
<hlm-input-group-addon>
|
|
26
|
-
<ng-icon name="lucideSearch" />
|
|
27
|
+
<ng-icon name="lucideSearch" class="spartan-command-input-icon" />
|
|
27
28
|
</hlm-input-group-addon>
|
|
28
29
|
</hlm-input-group>
|
|
29
30
|
`,
|
|
@@ -33,6 +34,6 @@ export class HlmCommandInput {
|
|
|
33
34
|
public readonly placeholder = input<string>('');
|
|
34
35
|
|
|
35
36
|
constructor() {
|
|
36
|
-
classes(() => '
|
|
37
|
+
classes(() => 'spartan-command-input-wrapper');
|
|
37
38
|
}
|
|
38
39
|
}
|
|
@@ -19,7 +19,7 @@ export class HlmCommandItem {
|
|
|
19
19
|
constructor() {
|
|
20
20
|
classes(
|
|
21
21
|
() =>
|
|
22
|
-
|
|
22
|
+
'spartan-command-item group/command-item w-full data-disabled:pointer-events-none data-disabled:opacity-50 data-hidden:hidden [&>ng-icon]:pointer-events-none [&>ng-icon]:shrink-0',
|
|
23
23
|
);
|
|
24
24
|
}
|
|
25
25
|
}
|
|
@@ -16,6 +16,6 @@ import { classes } from '<%- importAlias %>/utils';
|
|
|
16
16
|
})
|
|
17
17
|
export class HlmCommandList {
|
|
18
18
|
constructor() {
|
|
19
|
-
classes(() => '
|
|
19
|
+
classes(() => 'spartan-command-list overflow-x-hidden overflow-y-auto');
|
|
20
20
|
}
|
|
21
21
|
}
|
|
@@ -11,6 +11,6 @@ import { classes } from '<%- importAlias %>/utils';
|
|
|
11
11
|
})
|
|
12
12
|
export class HlmCommandSeparator {
|
|
13
13
|
constructor() {
|
|
14
|
-
classes(() => '
|
|
14
|
+
classes(() => 'spartan-command-separator block data-hidden:hidden');
|
|
15
15
|
}
|
|
16
16
|
}
|
|
@@ -17,6 +17,6 @@ import { classes } from '<%- importAlias %>/utils';
|
|
|
17
17
|
})
|
|
18
18
|
export class HlmCommand {
|
|
19
19
|
constructor() {
|
|
20
|
-
classes(() => '
|
|
20
|
+
classes(() => 'spartan-command flex size-full flex-col overflow-hidden');
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -3,6 +3,7 @@ import { CdkContextMenuTrigger } from '@angular/cdk/menu';
|
|
|
3
3
|
import { booleanAttribute, computed, Directive, effect, inject, input } from '@angular/core';
|
|
4
4
|
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
|
|
5
5
|
import { createMenuPosition, type MenuAlign, type MenuSide } from '@spartan-ng/brain/core';
|
|
6
|
+
import { classes } from '<%- importAlias %>/utils';
|
|
6
7
|
import { injectHlmContextMenuConfig } from './hlm-context-menu-token';
|
|
7
8
|
|
|
8
9
|
@Directive({
|
|
@@ -50,5 +51,7 @@ export class HlmContextMenuTrigger {
|
|
|
50
51
|
effect(() => {
|
|
51
52
|
this._cdkTrigger.menuPosition = this._menuPosition();
|
|
52
53
|
});
|
|
54
|
+
|
|
55
|
+
classes(() => 'select-none');
|
|
53
56
|
}
|
|
54
57
|
}
|
|
@@ -10,6 +10,7 @@ import { HlmDropdownMenuRadioIndicator } from './lib/hlm-dropdown-menu-radio-ind
|
|
|
10
10
|
import { HlmDropdownMenuSeparator } from './lib/hlm-dropdown-menu-separator';
|
|
11
11
|
import { HlmDropdownMenuShortcut } from './lib/hlm-dropdown-menu-shortcut';
|
|
12
12
|
import { HlmDropdownMenuSub } from './lib/hlm-dropdown-menu-sub';
|
|
13
|
+
import { HlmDropdownMenuSubTrigger } from './lib/hlm-dropdown-menu-sub-trigger';
|
|
13
14
|
|
|
14
15
|
import { HlmDropdownMenuTrigger } from './lib/hlm-dropdown-menu-trigger';
|
|
15
16
|
|
|
@@ -25,6 +26,7 @@ export * from './lib/hlm-dropdown-menu-radio-indicator';
|
|
|
25
26
|
export * from './lib/hlm-dropdown-menu-separator';
|
|
26
27
|
export * from './lib/hlm-dropdown-menu-shortcut';
|
|
27
28
|
export * from './lib/hlm-dropdown-menu-sub';
|
|
29
|
+
export * from './lib/hlm-dropdown-menu-sub-trigger';
|
|
28
30
|
export * from './lib/hlm-dropdown-menu-token';
|
|
29
31
|
export * from './lib/hlm-dropdown-menu-trigger';
|
|
30
32
|
|
|
@@ -41,5 +43,6 @@ export const HlmDropdownMenuImports = [
|
|
|
41
43
|
HlmDropdownMenuSeparator,
|
|
42
44
|
HlmDropdownMenuShortcut,
|
|
43
45
|
HlmDropdownMenuSub,
|
|
46
|
+
HlmDropdownMenuSubTrigger,
|
|
44
47
|
HlmDropdownMenuTrigger,
|
|
45
48
|
] as const;
|
|
@@ -8,15 +8,16 @@ import { classes } from '<%- importAlias %>/utils';
|
|
|
8
8
|
imports: [NgIcon],
|
|
9
9
|
providers: [provideIcons({ lucideCheck })],
|
|
10
10
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
11
|
+
host: { 'data-slot': 'dropdown-menu-checkbox-item-indicator' },
|
|
11
12
|
template: `
|
|
12
|
-
<ng-icon
|
|
13
|
+
<ng-icon name="lucideCheck" />
|
|
13
14
|
`,
|
|
14
15
|
})
|
|
15
16
|
export class HlmDropdownMenuCheckboxIndicator {
|
|
16
17
|
constructor() {
|
|
17
18
|
classes(
|
|
18
19
|
() =>
|
|
19
|
-
'
|
|
20
|
+
'spartan-dropdown-menu-item-indicator pointer-events-none opacity-0 group-data-checked/dropdown-menu-checkbox:opacity-100',
|
|
20
21
|
);
|
|
21
22
|
}
|
|
22
23
|
}
|
package/src/generators/ui/libs/dropdown-menu/files/lib/hlm-dropdown-menu-checkbox.ts.template
CHANGED
|
@@ -1,32 +1,52 @@
|
|
|
1
1
|
import { type BooleanInput } from '@angular/cdk/coercion';
|
|
2
|
-
import { CdkMenuItemCheckbox } from '@angular/cdk/menu';
|
|
2
|
+
import { CdkMenuItem, CdkMenuItemCheckbox, CdkMenuItemSelectable } from '@angular/cdk/menu';
|
|
3
3
|
import { Directive, booleanAttribute, inject, input } from '@angular/core';
|
|
4
4
|
import { classes } from '<%- importAlias %>/utils';
|
|
5
5
|
|
|
6
|
+
/** @internal. Use HlmDropdownMenuCheckbox instead. */
|
|
6
7
|
@Directive({
|
|
7
|
-
selector: '[
|
|
8
|
+
selector: '[hlmDropdownMenuCheckboxCdk]',
|
|
9
|
+
providers: [
|
|
10
|
+
{ provide: CdkMenuItemCheckbox, useExisting: HlmDropdownMenuCheckboxCdk },
|
|
11
|
+
{ provide: CdkMenuItemSelectable, useExisting: HlmDropdownMenuCheckboxCdk },
|
|
12
|
+
{ provide: CdkMenuItem, useExisting: CdkMenuItemSelectable },
|
|
13
|
+
],
|
|
14
|
+
})
|
|
15
|
+
export class HlmDropdownMenuCheckboxCdk extends CdkMenuItemCheckbox {
|
|
16
|
+
public readonly keepOpen = input<boolean, BooleanInput>(true, { transform: booleanAttribute });
|
|
17
|
+
|
|
18
|
+
public override trigger(options?: { keepOpen: boolean }) {
|
|
19
|
+
super.trigger({ ...options, keepOpen: this.keepOpen() });
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
@Directive({
|
|
24
|
+
selector: '[hlmDropdownMenuCheckbox],[hlmDropdownMenuCheckboxItem]',
|
|
8
25
|
hostDirectives: [
|
|
9
26
|
{
|
|
10
|
-
directive:
|
|
11
|
-
inputs: ['cdkMenuItemDisabled: disabled', 'cdkMenuItemChecked: checked'],
|
|
27
|
+
directive: HlmDropdownMenuCheckboxCdk,
|
|
28
|
+
inputs: ['cdkMenuItemDisabled: disabled', 'cdkMenuItemChecked: checked', 'keepOpen'],
|
|
12
29
|
outputs: ['cdkMenuItemTriggered: triggered'],
|
|
13
30
|
},
|
|
14
31
|
],
|
|
15
32
|
host: {
|
|
16
33
|
'data-slot': 'dropdown-menu-checkbox-item',
|
|
17
|
-
'[attr.data-disabled]': 'disabled
|
|
18
|
-
'[attr.data-checked]': 'checked
|
|
34
|
+
'[attr.data-disabled]': '_cdkMenuItem.disabled ? "" : null',
|
|
35
|
+
'[attr.data-checked]': '_cdkMenuItem.checked ? "" : null',
|
|
36
|
+
'[attr.data-inset]': 'inset() ? "" : null',
|
|
19
37
|
},
|
|
20
38
|
})
|
|
21
39
|
export class HlmDropdownMenuCheckbox {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
public readonly
|
|
40
|
+
protected readonly _cdkMenuItem = inject(HlmDropdownMenuCheckboxCdk);
|
|
41
|
+
|
|
42
|
+
public readonly inset = input<boolean, BooleanInput>(false, {
|
|
43
|
+
transform: booleanAttribute,
|
|
44
|
+
});
|
|
25
45
|
|
|
26
46
|
constructor() {
|
|
27
47
|
classes(
|
|
28
48
|
() =>
|
|
29
|
-
'
|
|
49
|
+
'spartan-dropdown-menu-checkbox-item group/dropdown-menu-checkbox relative flex w-full cursor-default items-center outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_ng-icon]:pointer-events-none [&_ng-icon]:shrink-0',
|
|
30
50
|
);
|
|
31
51
|
}
|
|
32
52
|
}
|
|
@@ -5,9 +5,7 @@ import { classes } from '<%- importAlias %>/utils';
|
|
|
5
5
|
@Directive({
|
|
6
6
|
selector: '[hlmDropdownMenuGroup],hlm-dropdown-menu-group',
|
|
7
7
|
hostDirectives: [CdkMenuGroup],
|
|
8
|
-
host: {
|
|
9
|
-
'data-slot': 'dropdown-menu-group',
|
|
10
|
-
},
|
|
8
|
+
host: { 'data-slot': 'dropdown-menu-group' },
|
|
11
9
|
})
|
|
12
10
|
export class HlmDropdownMenuGroup {
|
|
13
11
|
constructor() {
|
|
@@ -9,11 +9,11 @@ import { classes } from '<%- importAlias %>/utils';
|
|
|
9
9
|
providers: [provideIcons({ lucideChevronRight })],
|
|
10
10
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
11
11
|
template: `
|
|
12
|
-
<ng-icon name="lucideChevronRight" class="text-
|
|
12
|
+
<ng-icon name="lucideChevronRight" class="text-[calc(var(--spacing)*4)] rtl:rotate-180" />
|
|
13
13
|
`,
|
|
14
14
|
})
|
|
15
15
|
export class HlmDropdownMenuItemSubIndicator {
|
|
16
16
|
constructor() {
|
|
17
|
-
classes(() => 'ms-auto
|
|
17
|
+
classes(() => 'ms-auto flex items-center justify-center');
|
|
18
18
|
}
|
|
19
19
|
}
|
|
@@ -34,7 +34,7 @@ export class HlmDropdownMenuItem {
|
|
|
34
34
|
constructor() {
|
|
35
35
|
classes(
|
|
36
36
|
() =>
|
|
37
|
-
|
|
37
|
+
'spartan-dropdown-menu-item group/dropdown-menu-item relative flex w-full cursor-default items-center outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_ng-icon]:pointer-events-none [&_ng-icon]:shrink-0',
|
|
38
38
|
);
|
|
39
39
|
}
|
|
40
40
|
}
|
|
@@ -10,11 +10,11 @@ import { classes } from '<%- importAlias %>/utils';
|
|
|
10
10
|
},
|
|
11
11
|
})
|
|
12
12
|
export class HlmDropdownMenuLabel {
|
|
13
|
-
constructor() {
|
|
14
|
-
classes(() => 'block px-2 py-1.5 text-sm font-medium data-[inset]:pl-8');
|
|
15
|
-
}
|
|
16
|
-
|
|
17
13
|
public readonly inset = input<boolean, BooleanInput>(false, {
|
|
18
14
|
transform: booleanAttribute,
|
|
19
15
|
});
|
|
16
|
+
|
|
17
|
+
constructor() {
|
|
18
|
+
classes(() => 'spartan-dropdown-menu-label block');
|
|
19
|
+
}
|
|
20
20
|
}
|