@spartan-ng/cli 0.0.1-alpha.467 → 0.0.1-alpha.469

package/generators.json

@@ -72,6 +72,11 @@
 			"schema": "./src/generators/migrate-brain-imports/schema.json",
 			"description": "Migrate Brain imports to use secondary entrypoints."
 		},
+		"migrate-helm-imports": {
+			"factory": "./src/generators/migrate-helm-imports/compat",
+			"schema": "./src/generators/migrate-helm-imports/schema.json",
+			"description": "Migrate Helm imports to use the new imports structure."
+		},
 		"migrate-scroll-area": {
 			"factory": "./src/generators/migrate-scroll-area/compat",
 			"schema": "./src/generators/migrate-scroll-area/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spartan-ng/cli",
-  "version": "0.0.1-alpha.467",
+  "version": "0.0.1-alpha.469",
   "type": "commonjs",
   "dependencies": {
     "@nx/angular": ">=20.0.0",

package/src/generators/base/generator.js

@@ -16,7 +16,7 @@ async function hlmBaseGenerator(tree, options) {
     const tasks = [];
     const targetLibDir = (0, get_target_library_directory_1.getTargetLibraryDirectory)(options, tree);
     const existingPathsByAlias = (0, tsconfig_1.readTsConfigPathsFromTree)(tree);
-    const tsConfigAliasToUse = `@spartan-ng/${options.publicName}`;
+    const tsConfigAliasToUse = `@spartan-ng/helm/${options.primitiveName}`;
     if (Object.keys(existingPathsByAlias).includes(tsConfigAliasToUse)) {
         console.log(`Skipping ${tsConfigAliasToUse}. It's already installed!`);
         return (0, devkit_1.runTasksInSerial)(...tasks);

package/src/generators/base/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/base/generator.ts"],"names":[],"mappings":";;AAmBA,4CAoCC;;AAvDD,uCAOoB;AACpB,+BAAyC;AACzC,wDAAkC;AAClC,mDAAiE;AACjE,6DAAuE;AACvE,yEAA6F;AAC7F,mDAAgD;AAChD,qFAA+E;AAC/E,iFAA4E;AAE5E,yCAAsD;AAE/C,KAAK,UAAU,gBAAgB,CAAC,IAAU,EAAE,OAA+B;IACjF,MAAM,KAAK,GAAwB,EAAE,CAAC;IACtC,MAAM,YAAY,GAAG,IAAA,wDAAyB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAE9D,MAAM,oBAAoB,GAAG,IAAA,oCAAyB,EAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,kBAAkB,GAAG,eAAe,OAAO,CAAC,UAAU,EAAE,CAAC;IAE/D,IAAI,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACpE,OAAO,CAAC,GAAG,CAAC,YAAY,kBAAkB,2BAA2B,CAAC,CAAC;QACvE,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,IAAA,oBAAe,EAAC,IAAI,EAAE,kBAAkB,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,GAAG,IAAA,0BAAiB,EAAC,YAAY,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;IAClH,CAAC;SAAM,CAAC;QACP,KAAK,CAAC,IAAI,CAAC,MAAM,IAAA,qDAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,4GAA4G;IAC5G,IAAA,yBAAW,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IAE9G,uCAAuC;IACvC,IAAA,sBAAa,EACZ,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,EACvE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,EAC9B,OAAO,CACP,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,eAAe,EAAE,mCAAwB,EAAE,IAAI,CAAC,CAAC;IACzG,MAAM,kBAAkB,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,cAAc,EAAE,mCAAwB,EAAE,IAAI,CAAC,CAAC;IAC5G,MAAM,YAAY,GAAG,IAAA,6CAAoB,EAAC,OAAO,EAAE,cAAc,EAAE,kBAAkB,CAAC,CAAC;IACvF,MAAM,eAAe,GAAG,IAAA,gDAAuB,GAAE,CAAC;IAElD,KAAK,CAAC,IAAI,CAAC,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC;IAC9E,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;AACnC,CAAC;AAED,kBAAe,gBAAgB,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/base/generator.ts"],"names":[],"mappings":";;AAmBA,4CAoCC;;AAvDD,uCAOoB;AACpB,+BAAyC;AACzC,wDAAkC;AAClC,mDAAiE;AACjE,6DAAuE;AACvE,yEAA6F;AAC7F,mDAAgD;AAChD,qFAA+E;AAC/E,iFAA4E;AAE5E,yCAAsD;AAE/C,KAAK,UAAU,gBAAgB,CAAC,IAAU,EAAE,OAA+B;IACjF,MAAM,KAAK,GAAwB,EAAE,CAAC;IACtC,MAAM,YAAY,GAAG,IAAA,wDAAyB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAE9D,MAAM,oBAAoB,GAAG,IAAA,oCAAyB,EAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,kBAAkB,GAAG,oBAAoB,OAAO,CAAC,aAAa,EAAE,CAAC;IAEvE,IAAI,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACpE,OAAO,CAAC,GAAG,CAAC,YAAY,kBAAkB,2BAA2B,CAAC,CAAC;QACvE,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,IAAA,oBAAe,EAAC,IAAI,EAAE,kBAAkB,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,GAAG,IAAA,0BAAiB,EAAC,YAAY,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;IAClH,CAAC;SAAM,CAAC;QACP,KAAK,CAAC,IAAI,CAAC,MAAM,IAAA,qDAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,4GAA4G;IAC5G,IAAA,yBAAW,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IAE9G,uCAAuC;IACvC,IAAA,sBAAa,EACZ,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,EACvE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,EAC9B,OAAO,CACP,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,eAAe,EAAE,mCAAwB,EAAE,IAAI,CAAC,CAAC;IACzG,MAAM,kBAAkB,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,cAAc,EAAE,mCAAwB,EAAE,IAAI,CAAC,CAAC;IAC5G,MAAM,YAAY,GAAG,IAAA,6CAAoB,EAAC,OAAO,EAAE,cAAc,EAAE,kBAAkB,CAAC,CAAC;IACvF,MAAM,eAAe,GAAG,IAAA,gDAAuB,GAAE,CAAC;IAElD,KAAK,CAAC,IAAI,CAAC,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC;IAC9E,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;AACnC,CAAC;AAED,kBAAe,gBAAgB,CAAC"}

package/src/generators/base/lib/initialize-angular-library.js

@@ -44,7 +44,7 @@ async function initializeAngularLibrary(tree, options) {
         skipFormat: true,
         simpleName: true,
         buildable: true,
-        importPath: `@spartan-ng/${options.publicName}`,
+        importPath: `@spartan-ng/helm/${options.primitiveName}`,
         prefix: 'hlm',
         skipModule: true,
         directory: (0, devkit_1.joinPathFragments)(options.directory, options.publicName),

package/src/generators/base/lib/initialize-angular-library.js.map

@@ -1 +1 @@
-{"version":3,"file":"initialize-angular-library.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/base/lib/initialize-angular-library.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,4DAkBC;AArBD,uCAA0D;AAGnD,KAAK,UAAU,wBAAwB,CAAC,IAAU,EAAE,OAA+B;IACzF,OAAO,MAAM,CACZ;IACC,6DAA6D;IAC7D,aAAa;IACb,wBAAwB,GACxB,CACD,CAAC,gBAAgB,CAAC,IAAI,EAAE;QACxB,IAAI,EAAE,OAAO,CAAC,UAAU;QACxB,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,eAAe,OAAO,CAAC,UAAU,EAAE;QAC/C,MAAM,EAAE,KAAK;QACb,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC;QACnE,IAAI,EAAE,OAAO,CAAC,IAAI;KAClB,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"initialize-angular-library.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/base/lib/initialize-angular-library.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,4DAkBC;AArBD,uCAA0D;AAGnD,KAAK,UAAU,wBAAwB,CAAC,IAAU,EAAE,OAA+B;IACzF,OAAO,MAAM,CACZ;IACC,6DAA6D;IAC7D,aAAa;IACb,wBAAwB,GACxB,CACD,CAAC,gBAAgB,CAAC,IAAI,EAAE;QACxB,IAAI,EAAE,OAAO,CAAC,UAAU;QACxB,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,oBAAoB,OAAO,CAAC,aAAa,EAAE;QACvD,MAAM,EAAE,KAAK;QACb,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC;QACnE,IAAI,EAAE,OAAO,CAAC,IAAI;KAClB,CAAC,CAAC;AACJ,CAAC"}

package/src/generators/healthcheck/generator.js

@@ -7,6 +7,7 @@ const brain_imports_1 = require("./healthchecks/brain-imports");
 const brn_radio_1 = require("./healthchecks/brn-radio");
 const brn_toggle_group_1 = require("./healthchecks/brn-toggle-group");
 const core_imports_1 = require("./healthchecks/core-imports");
+const helm_imports_1 = require("./healthchecks/helm-imports");
 const hlm_icon_1 = require("./healthchecks/hlm-icon");
 const hlm_scroll_area_1 = require("./healthchecks/hlm-scroll-area");
 const hlm_select_1 = require("./healthchecks/hlm-select");
@@ -25,6 +26,7 @@ async function healthcheckGenerator(tree, options) {
         brn_radio_1.brainRadioHealthcheck,
         hlm_select_1.selectHealthcheck,
         brn_toggle_group_1.brainToggleHealthcheck,
+        helm_imports_1.helmImportsHealthcheck,
     ];
     const failedReports = [];
     for (const healthcheck of healthchecks) {

package/src/generators/healthcheck/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/healthcheck/generator.ts"],"names":[],"mappings":";;AAeA,oDAsCC;AArDD,uCAAuD;AACvD,iDAAyG;AACzG,gEAAuE;AACvE,wDAAiE;AACjE,sEAAyE;AACzE,8DAAqE;AACrE,sDAA8D;AAC9D,oEAAuE;AACvE,0DAA8D;AAC9D,oDAA4D;AAE5D,2CAA4C;AAC5C,+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,yCAAsB;KACtB,CAAC;IAEF,MAAM,aAAa,GAAwB,EAAE,CAAC;IAE9C,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAc,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QACvD,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,GAAG,OAAO,CAAC,OAAO,IAAI,CAAC,MAAM,IAAA,mBAAU,EAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;YAE7E,IAAI,GAAG,EAAE,CAAC;gBACT,MAAM,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;YACxE,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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/healthcheck/generator.ts"],"names":[],"mappings":";;AAgBA,oDAuCC;AAvDD,uCAAuD;AACvD,iDAAyG;AACzG,gEAAuE;AACvE,wDAAiE;AACjE,sEAAyE;AACzE,8DAAqE;AACrE,8DAAqE;AACrE,sDAA8D;AAC9D,oEAAuE;AACvE,0DAA8D;AAC9D,oDAA4D;AAE5D,2CAA4C;AAC5C,+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,yCAAsB;QACtB,qCAAsB;KACtB,CAAC;IAEF,MAAM,aAAa,GAAwB,EAAE,CAAC;IAE9C,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAc,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QACvD,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,GAAG,OAAO,CAAC,OAAO,IAAI,CAAC,MAAM,IAAA,mBAAU,EAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;YAE7E,IAAI,GAAG,EAAE,CAAC;gBACT,MAAM,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;YACxE,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"}

package/src/generators/healthcheck/healthchecks/brn-radio.js

@@ -12,6 +12,10 @@ exports.brainRadioHealthcheck = {
             if (!file.endsWith('.ts') && !file.endsWith('.html')) {
                 return;
             }
+            // if it is the HlmRadioComponent itself skip it.
+            if (file.endsWith('hlm-radio.component.ts')) {
+                return;
+            }
             const contents = tree.read(file, 'utf-8');
             if (!contents) {
                 return;

package/src/generators/healthcheck/healthchecks/brn-radio.js.map

@@ -1 +1 @@
-{"version":3,"file":"brn-radio.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/healthcheck/healthchecks/brn-radio.ts"],"names":[],"mappings":";;;AAAA,uCAAkD;AAClD,6DAAsE;AACtE,kDAAmE;AAEtD,QAAA,qBAAqB,GAAgB;IACjD,IAAI,EAAE,aAAa;IACnB,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO;QACzB,IAAA,6BAAoB,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,4DAA4D;YAC5D,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBACtD,OAAO;YACR,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE1C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,OAAO;YACR,CAAC;YAED,IAAI,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;gBACrC,OAAO,CACN,8EAA8E,EAC9E,kCAAmB,CAAC,KAAK,EACzB,IAAI,CACJ,CAAC;YACH,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IACD,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACnB,MAAM,IAAA,iCAAqB,EAAC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACb,CAAC;IACD,MAAM,EAAE,wCAAwC;CAChD,CAAC"}
+{"version":3,"file":"brn-radio.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/healthcheck/healthchecks/brn-radio.ts"],"names":[],"mappings":";;;AAAA,uCAAkD;AAClD,6DAAsE;AACtE,kDAAmE;AAEtD,QAAA,qBAAqB,GAAgB;IACjD,IAAI,EAAE,aAAa;IACnB,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO;QACzB,IAAA,6BAAoB,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,4DAA4D;YAC5D,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBACtD,OAAO;YACR,CAAC;YACD,iDAAiD;YACjD,IAAI,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC;gBAC7C,OAAO;YACR,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE1C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,OAAO;YACR,CAAC;YAED,IAAI,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;gBACrC,OAAO,CACN,8EAA8E,EAC9E,kCAAmB,CAAC,KAAK,EACzB,IAAI,CACJ,CAAC;YACH,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IACD,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACnB,MAAM,IAAA,iCAAqB,EAAC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACb,CAAC;IACD,MAAM,EAAE,wCAAwC;CAChD,CAAC"}

package/src/generators/healthcheck/healthchecks/helm-imports.d.ts

@@ -0,0 +1,2 @@
+import { Healthcheck } from '../healthchecks';
+export declare const helmImportsHealthcheck: Healthcheck;

package/src/generators/healthcheck/healthchecks/helm-imports.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.helmImportsHealthcheck = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const generator_1 = tslib_1.__importDefault(require("../../migrate-helm-imports/generator"));
+const import_map_1 = tslib_1.__importDefault(require("../../migrate-helm-imports/import-map"));
+const healthchecks_1 = require("../healthchecks");
+exports.helmImportsHealthcheck = {
+    name: 'Helm imports',
+    async detect(tree, failure) {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, '/', (file) => {
+            // if the file is a .ts or .json file, check for helm imports/packages
+            if (!file.endsWith('.ts') || file.endsWith('.json')) {
+                return;
+            }
+            const contents = tree.read(file, 'utf-8');
+            if (!contents) {
+                return;
+            }
+            for (const [importPath, helmPackage] of Object.entries(import_map_1.default)) {
+                if (contents.includes(importPath)) {
+                    failure(`The import ${importPath} is deprecated. Please use the ${helmPackage} package instead.`, healthchecks_1.HealthcheckSeverity.Error, true);
+                }
+            }
+        });
+    },
+    fix: async (tree) => {
+        await (0, generator_1.default)(tree, { skipFormat: true });
+        return true;
+    },
+    prompt: 'Would you like to migrate helm imports?',
+};
+//# sourceMappingURL=helm-imports.js.map

package/src/generators/healthcheck/healthchecks/helm-imports.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"helm-imports.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/healthcheck/healthchecks/helm-imports.ts"],"names":[],"mappings":";;;;AAAA,uCAAkD;AAClD,6FAA+E;AAC/E,+FAA8D;AAC9D,kDAAmE;AAEtD,QAAA,sBAAsB,GAAgB;IAClD,IAAI,EAAE,cAAc;IACpB,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO;QACzB,IAAA,6BAAoB,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,sEAAsE;YACtE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrD,OAAO;YACR,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE1C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,OAAO;YACR,CAAC;YAED,KAAK,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,oBAAS,CAAC,EAAE,CAAC;gBACnE,IAAI,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBACnC,OAAO,CACN,cAAc,UAAU,kCAAkC,WAAW,mBAAmB,EACxF,kCAAmB,CAAC,KAAK,EACzB,IAAI,CACJ,CAAC;gBACH,CAAC;YACF,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IACD,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACnB,MAAM,IAAA,mBAA2B,EAAC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9D,OAAO,IAAI,CAAC;IACb,CAAC;IACD,MAAM,EAAE,yCAAyC;CACjD,CAAC"}

package/src/generators/migrate-helm-imports/compat.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (generatorOptions: import("./schema").MigrateHelmImportsGeneratorSchema) => (tree: any, context: any) => Promise<any>;
+export default _default;

package/src/generators/migrate-helm-imports/compat.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const generator_1 = require("./generator");
+exports.default = (0, devkit_1.convertNxGenerator)(generator_1.migrateHelmImportsGenerator);
+//# sourceMappingURL=compat.js.map

package/src/generators/migrate-helm-imports/compat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-helm-imports/compat.ts"],"names":[],"mappings":";;AAAA,uCAAgD;AAChD,2CAA0D;AAE1D,kBAAe,IAAA,2BAAkB,EAAC,uCAA2B,CAAC,CAAC"}

package/src/generators/migrate-helm-imports/generator.d.ts

@@ -0,0 +1,4 @@
+import { Tree } from '@nx/devkit';
+import { MigrateHelmImportsGeneratorSchema } from './schema';
+export declare function migrateHelmImportsGenerator(tree: Tree, options: MigrateHelmImportsGeneratorSchema): Promise<void>;
+export default migrateHelmImportsGenerator;

package/src/generators/migrate-helm-imports/generator.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrateHelmImportsGenerator = migrateHelmImportsGenerator;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const devkit_exports_1 = require("nx/src/devkit-exports");
+const path_1 = require("path");
+const binary_extensions_1 = require("../migrate-brain-imports/utils/binary-extensions");
+const import_map_1 = tslib_1.__importDefault(require("./import-map"));
+async function migrateHelmImportsGenerator(tree, options) {
+    for (const [from, to] of Object.entries(import_map_1.default)) {
+        replaceUsages(tree, from, to);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+}
+// based on https://github.com/nrwl/nx/blob/master/packages/devkit/src/utils/replace-package.ts
+function replaceUsages(tree, oldPackageName, newPackageName) {
+    (0, devkit_1.visitNotIgnoredFiles)(tree, '.', (path) => {
+        if ((0, binary_extensions_1.isBinaryPath)(path)) {
+            return;
+        }
+        const ignoredFiles = [
+            'yarn.lock',
+            'package-lock.json',
+            'pnpm-lock.yaml',
+            'bun.lockb',
+            'CHANGELOG.md',
+            // this is relevant for this repo only - and this file is auto-generated
+            'supported-ui-libraries.json',
+            // we don't want to replace usages in the import map as these are used to detect the usages
+            'import-map.ts',
+        ];
+        if (ignoredFiles.includes((0, path_1.basename)(path))) {
+            return;
+        }
+        try {
+            const contents = tree.read(path).toString();
+            if (!contents.includes(oldPackageName)) {
+                return;
+            }
+            tree.write(path, contents.replace(new RegExp(oldPackageName, 'g'), newPackageName));
+        }
+        catch {
+            devkit_exports_1.logger.warn(`Could not replace ${oldPackageName} with ${newPackageName} in ${path}.`);
+        }
+    });
+}
+exports.default = migrateHelmImportsGenerator;
+//# sourceMappingURL=generator.js.map

package/src/generators/migrate-helm-imports/generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-helm-imports/generator.ts"],"names":[],"mappings":";;AAOA,kEAQC;;AAfD,uCAAqE;AACrE,0DAA+C;AAC/C,+BAAgC;AAChC,wFAAgF;AAChF,sEAAqC;AAG9B,KAAK,UAAU,2BAA2B,CAAC,IAAU,EAAE,OAA0C;IACvG,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,oBAAS,CAAC,EAAE,CAAC;QACpD,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACzB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACzB,CAAC;AACF,CAAC;AAED,+FAA+F;AAC/F,SAAS,aAAa,CAAC,IAAU,EAAE,cAAsB,EAAE,cAAsB;IAChF,IAAA,6BAAoB,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE;QACxC,IAAI,IAAA,gCAAY,EAAC,IAAI,CAAC,EAAE,CAAC;YACxB,OAAO;QACR,CAAC;QAED,MAAM,YAAY,GAAG;YACpB,WAAW;YACX,mBAAmB;YACnB,gBAAgB;YAChB,WAAW;YACX,cAAc;YACd,wEAAwE;YACxE,6BAA6B;YAC7B,2FAA2F;YAC3F,eAAe;SACf,CAAC;QACF,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YAC3C,OAAO;QACR,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;YAE5C,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;gBACxC,OAAO;YACR,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;QACrF,CAAC;QAAC,MAAM,CAAC;YACR,uBAAM,CAAC,IAAI,CAAC,qBAAqB,cAAc,SAAS,cAAc,OAAO,IAAI,GAAG,CAAC,CAAC;QACvF,CAAC;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,kBAAe,2BAA2B,CAAC"}

package/src/generators/migrate-helm-imports/import-map.d.ts

@@ -0,0 +1,53 @@
+declare const _default: {
+    '@spartan-ng/ui-accordion-helm': string;
+    '@spartan-ng/ui-alert-helm': string;
+    '@spartan-ng/ui-alert-dialog-helm': string;
+    '@spartan-ng/ui-alertdialog-helm': string;
+    '@spartan-ng/ui-aspect-ratio-helm': string;
+    '@spartan-ng/ui-aspectratio-helm': string;
+    '@spartan-ng/ui-avatar-helm': string;
+    '@spartan-ng/ui-badge-helm': string;
+    '@spartan-ng/ui-breadcrumb-helm': string;
+    '@spartan-ng/ui-button-helm': string;
+    '@spartan-ng/ui-calendar-helm': string;
+    '@spartan-ng/ui-card-helm': string;
+    '@spartan-ng/ui-carousel-helm': string;
+    '@spartan-ng/ui-checkbox-helm': string;
+    '@spartan-ng/ui-command-helm': string;
+    '@spartan-ng/ui-date-picker-helm': string;
+    '@spartan-ng/ui-datepicker-helm': string;
+    '@spartan-ng/ui-dialog-helm': string;
+    '@spartan-ng/ui-form-field-helm': string;
+    '@spartan-ng/ui-formfield-helm': string;
+    '@spartan-ng/ui-hover-card-helm': string;
+    '@spartan-ng/ui-hovercard-helm': string;
+    '@spartan-ng/ui-icon-helm': string;
+    '@spartan-ng/ui-input-helm': string;
+    '@spartan-ng/ui-input-otp-helm': string;
+    '@spartan-ng/ui-inputotp-helm': string;
+    '@spartan-ng/ui-label-helm': string;
+    '@spartan-ng/ui-menu-helm': string;
+    '@spartan-ng/ui-pagination-helm': string;
+    '@spartan-ng/ui-popover-helm': string;
+    '@spartan-ng/ui-progress-helm': string;
+    '@spartan-ng/ui-radio-group-helm': string;
+    '@spartan-ng/ui-radiogroup-helm': string;
+    '@spartan-ng/ui-scroll-area-helm': string;
+    '@spartan-ng/ui-scrollarea-helm': string;
+    '@spartan-ng/ui-select-helm': string;
+    '@spartan-ng/ui-separator-helm': string;
+    '@spartan-ng/ui-sheet-helm': string;
+    '@spartan-ng/ui-skeleton-helm': string;
+    '@spartan-ng/ui-slider-helm': string;
+    '@spartan-ng/ui-sonner-helm': string;
+    '@spartan-ng/ui-spinner-helm': string;
+    '@spartan-ng/ui-switch-helm': string;
+    '@spartan-ng/ui-table-helm': string;
+    '@spartan-ng/ui-tabs-helm': string;
+    '@spartan-ng/ui-toggle-helm': string;
+    '@spartan-ng/ui-toggle-group-helm': string;
+    '@spartan-ng/ui-togglegroup-helm': string;
+    '@spartan-ng/ui-tooltip-helm': string;
+    '@spartan-ng/ui-typography-helm': string;
+};
+export default _default;

package/src/generators/migrate-helm-imports/import-map.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    '@spartan-ng/ui-accordion-helm': '@spartan-ng/helm/accordion',
+    '@spartan-ng/ui-alert-helm': '@spartan-ng/helm/alert',
+    '@spartan-ng/ui-alert-dialog-helm': '@spartan-ng/helm/alert-dialog',
+    '@spartan-ng/ui-alertdialog-helm': '@spartan-ng/helm/alert-dialog',
+    '@spartan-ng/ui-aspect-ratio-helm': '@spartan-ng/helm/aspect-ratio',
+    '@spartan-ng/ui-aspectratio-helm': '@spartan-ng/helm/aspect-ratio',
+    '@spartan-ng/ui-avatar-helm': '@spartan-ng/helm/avatar',
+    '@spartan-ng/ui-badge-helm': '@spartan-ng/helm/badge',
+    '@spartan-ng/ui-breadcrumb-helm': '@spartan-ng/helm/breadcrumb',
+    '@spartan-ng/ui-button-helm': '@spartan-ng/helm/button',
+    '@spartan-ng/ui-calendar-helm': '@spartan-ng/helm/calendar',
+    '@spartan-ng/ui-card-helm': '@spartan-ng/helm/card',
+    '@spartan-ng/ui-carousel-helm': '@spartan-ng/helm/carousel',
+    '@spartan-ng/ui-checkbox-helm': '@spartan-ng/helm/checkbox',
+    '@spartan-ng/ui-command-helm': '@spartan-ng/helm/command',
+    '@spartan-ng/ui-date-picker-helm': '@spartan-ng/helm/date-picker',
+    '@spartan-ng/ui-datepicker-helm': '@spartan-ng/helm/date-picker',
+    '@spartan-ng/ui-dialog-helm': '@spartan-ng/helm/dialog',
+    '@spartan-ng/ui-form-field-helm': '@spartan-ng/helm/form-field',
+    '@spartan-ng/ui-formfield-helm': '@spartan-ng/helm/form-field',
+    '@spartan-ng/ui-hover-card-helm': '@spartan-ng/helm/hover-card',
+    '@spartan-ng/ui-hovercard-helm': '@spartan-ng/helm/hover-card',
+    '@spartan-ng/ui-icon-helm': '@spartan-ng/helm/icon',
+    '@spartan-ng/ui-input-helm': '@spartan-ng/helm/input',
+    '@spartan-ng/ui-input-otp-helm': '@spartan-ng/helm/input-otp',
+    '@spartan-ng/ui-inputotp-helm': '@spartan-ng/helm/input-otp',
+    '@spartan-ng/ui-label-helm': '@spartan-ng/helm/label',
+    '@spartan-ng/ui-menu-helm': '@spartan-ng/helm/menu',
+    '@spartan-ng/ui-pagination-helm': '@spartan-ng/helm/pagination',
+    '@spartan-ng/ui-popover-helm': '@spartan-ng/helm/popover',
+    '@spartan-ng/ui-progress-helm': '@spartan-ng/helm/progress',
+    '@spartan-ng/ui-radio-group-helm': '@spartan-ng/helm/radio-group',
+    '@spartan-ng/ui-radiogroup-helm': '@spartan-ng/helm/radio-group',
+    '@spartan-ng/ui-scroll-area-helm': '@spartan-ng/helm/scroll-area',
+    '@spartan-ng/ui-scrollarea-helm': '@spartan-ng/helm/scroll-area',
+    '@spartan-ng/ui-select-helm': '@spartan-ng/helm/select',
+    '@spartan-ng/ui-separator-helm': '@spartan-ng/helm/separator',
+    '@spartan-ng/ui-sheet-helm': '@spartan-ng/helm/sheet',
+    '@spartan-ng/ui-skeleton-helm': '@spartan-ng/helm/skeleton',
+    '@spartan-ng/ui-slider-helm': '@spartan-ng/helm/slider',
+    '@spartan-ng/ui-sonner-helm': '@spartan-ng/helm/sonner',
+    '@spartan-ng/ui-spinner-helm': '@spartan-ng/helm/spinner',
+    '@spartan-ng/ui-switch-helm': '@spartan-ng/helm/switch',
+    '@spartan-ng/ui-table-helm': '@spartan-ng/helm/table',
+    '@spartan-ng/ui-tabs-helm': '@spartan-ng/helm/tabs',
+    '@spartan-ng/ui-toggle-helm': '@spartan-ng/helm/toggle',
+    '@spartan-ng/ui-toggle-group-helm': '@spartan-ng/helm/toggle-group',
+    '@spartan-ng/ui-togglegroup-helm': '@spartan-ng/helm/toggle-group',
+    '@spartan-ng/ui-tooltip-helm': '@spartan-ng/helm/tooltip',
+    '@spartan-ng/ui-typography-helm': '@spartan-ng/helm/typography',
+};
+//# sourceMappingURL=import-map.js.map

package/src/generators/migrate-helm-imports/import-map.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"import-map.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-helm-imports/import-map.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACd,+BAA+B,EAAE,4BAA4B;IAC7D,2BAA2B,EAAE,wBAAwB;IACrD,kCAAkC,EAAE,+BAA+B;IACnE,iCAAiC,EAAE,+BAA+B;IAClE,kCAAkC,EAAE,+BAA+B;IACnE,iCAAiC,EAAE,+BAA+B;IAClE,4BAA4B,EAAE,yBAAyB;IACvD,2BAA2B,EAAE,wBAAwB;IACrD,gCAAgC,EAAE,6BAA6B;IAC/D,4BAA4B,EAAE,yBAAyB;IACvD,8BAA8B,EAAE,2BAA2B;IAC3D,0BAA0B,EAAE,uBAAuB;IACnD,8BAA8B,EAAE,2BAA2B;IAC3D,8BAA8B,EAAE,2BAA2B;IAC3D,6BAA6B,EAAE,0BAA0B;IACzD,iCAAiC,EAAE,8BAA8B;IACjE,gCAAgC,EAAE,8BAA8B;IAChE,4BAA4B,EAAE,yBAAyB;IACvD,gCAAgC,EAAE,6BAA6B;IAC/D,+BAA+B,EAAE,6BAA6B;IAC9D,gCAAgC,EAAE,6BAA6B;IAC/D,+BAA+B,EAAE,6BAA6B;IAC9D,0BAA0B,EAAE,uBAAuB;IACnD,2BAA2B,EAAE,wBAAwB;IACrD,+BAA+B,EAAE,4BAA4B;IAC7D,8BAA8B,EAAE,4BAA4B;IAC5D,2BAA2B,EAAE,wBAAwB;IACrD,0BAA0B,EAAE,uBAAuB;IACnD,gCAAgC,EAAE,6BAA6B;IAC/D,6BAA6B,EAAE,0BAA0B;IACzD,8BAA8B,EAAE,2BAA2B;IAC3D,iCAAiC,EAAE,8BAA8B;IACjE,gCAAgC,EAAE,8BAA8B;IAChE,iCAAiC,EAAE,8BAA8B;IACjE,gCAAgC,EAAE,8BAA8B;IAChE,4BAA4B,EAAE,yBAAyB;IACvD,+BAA+B,EAAE,4BAA4B;IAC7D,2BAA2B,EAAE,wBAAwB;IACrD,8BAA8B,EAAE,2BAA2B;IAC3D,4BAA4B,EAAE,yBAAyB;IACvD,4BAA4B,EAAE,yBAAyB;IACvD,6BAA6B,EAAE,0BAA0B;IACzD,4BAA4B,EAAE,yBAAyB;IACvD,2BAA2B,EAAE,wBAAwB;IACrD,0BAA0B,EAAE,uBAAuB;IACnD,4BAA4B,EAAE,yBAAyB;IACvD,kCAAkC,EAAE,+BAA+B;IACnE,iCAAiC,EAAE,+BAA+B;IAClE,6BAA6B,EAAE,0BAA0B;IACzD,gCAAgC,EAAE,6BAA6B;CAC/D,CAAC"}

package/src/generators/migrate-helm-imports/schema.d.ts

@@ -0,0 +1,3 @@
+export interface MigrateHelmImportsGeneratorSchema {
+	skipFormat?: boolean;
+}

package/src/generators/migrate-helm-imports/schema.json

@@ -0,0 +1,13 @@
+{
+	"$schema": "http://json-schema.org/draft-07/schema",
+	"$id": "MigrateHelmImports",
+	"title": "",
+	"type": "object",
+	"properties": {
+		"skipFormat": {
+			"type": "boolean",
+			"description": "Skip formatting the code after migration."
+		}
+	},
+	"required": []
+}

package/src/generators/migrate-helm-libraries/generator.js

@@ -91,8 +91,13 @@ async function detectLibraries(tree) {
     // store the list of libraries in the tsconfig
     const existingLibraries = [];
     for (const libraryName in supportedLibraries) {
-        const library = supportedLibraries[libraryName];
-        if (tsconfigPaths[`@spartan-ng/${library.internalName}`]) {
+        if (tsconfigPaths[`@spartan-ng/ui-${libraryName}-helm`]) {
+            existingLibraries.push(libraryName);
+        }
+        else if (tsconfigPaths[`@spartan-ng/ui-${libraryName.replaceAll('-', '')}-helm`]) {
+            existingLibraries.push(libraryName);
+        }
+        else if (tsconfigPaths[`@spartan-ng/helm/${libraryName}`]) {
             existingLibraries.push(libraryName);
         }
     }
@@ -101,20 +106,43 @@ async function detectLibraries(tree) {
 async function removeExistingLibraries(tree, options, libraries) {
     const tsconfigPaths = (0, tsconfig_1.readTsConfigPathsFromTree)(tree);
     for (const library of libraries) {
+        // determine the library path
+        let importPath;
+        const compatLibrary = library.toString().replaceAll('-', '');
+        if (`@spartan-ng/helm/${library}` in tsconfigPaths) {
+            importPath = `@spartan-ng/helm/${library}`;
+        }
+        else if (`@spartan-ng/ui-${library}-helm` in tsconfigPaths) {
+            importPath = `@spartan-ng/ui-${library}-helm`;
+        } // there is also a case where the library previous was added without hypens e.g. ui-aspectratio-helm
+        else if (`@spartan-ng/ui-${compatLibrary}-helm` in tsconfigPaths) {
+            importPath = `@spartan-ng/ui-${compatLibrary}-helm`;
+        }
         // get the tsconfig path for the library
-        const tsconfigPath = tsconfigPaths[`@spartan-ng/ui-${library}-helm`];
-        if (!tsconfigPath) {
+        const tsconfigPath = tsconfigPaths[importPath];
+        if (!tsconfigPath || !importPath) {
             throw new Error(`Could not find tsconfig path for library ${library}`);
         }
         // if there is more than one path then we assume we should use the first one
         const path = tsconfigPath[0];
         // if we are in the Nx CLI we can use the nx generator to remove a library
         if (!options.angularCli) {
+            // We get the projectName from the project.json in the path of the library
+            const projectRoot = (0, path_1.dirname)(path).replace(/\/src$/, '');
+            const packageJsonPath = (0, path_1.join)(projectRoot, 'project.json');
+            let projectName;
+            if (tree.exists(packageJsonPath)) {
+                const packageJson = (0, devkit_1.readJson)(tree, packageJsonPath);
+                projectName = packageJson.name;
+            }
+            if (!projectName) {
+                throw new Error(`Could not find the project name for library: ${library} in project root path ${projectRoot}`);
+            }
             await (0, workspace_1.removeGenerator)(tree, {
-                projectName: `ui-${library}-helm`,
+                projectName,
                 forceRemove: true,
                 skipFormat: true,
-                importPath: `@spartan-ng/ui-${library}-helm`,
+                importPath,
             });
         }
         else {
@@ -126,7 +154,7 @@ async function removeExistingLibraries(tree, options, libraries) {
             (0, deleteFiles_1.deleteFiles)(tree, directory);
             // remove the path from the tsconfig
             (0, devkit_1.updateJson)(tree, (0, js_1.getRootTsConfigPathInTree)(tree), (json) => {
-                delete json.compilerOptions.paths[`@spartan-ng/ui-${library}-helm`];
+                delete json.compilerOptions.paths[importPath];
                 return json;
             });
         }
@@ -137,6 +165,6 @@ async function regenerateLibraries(tree, options, libraries) {
     const config = await (0, config_1.getOrCreateConfig)(tree);
     await (0, generator_1.createPrimitiveLibraries)({
         primitives: libraries,
-    }, Object.keys(supportedLibraries), supportedLibraries, tree, { ...options, installPeerDependencies: true }, config);
+    }, Object.keys(supportedLibraries), supportedLibraries, tree, { ...options, installPeerDependencies: false }, config);
 }
 //# sourceMappingURL=generator.js.map

package/src/generators/migrate-helm-libraries/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-helm-libraries/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-helm-libraries/generator.ts"],"names":[],"mappings":"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"}

package/src/generators/ui/add-dependent-primitive.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addDependentPrimitives = void 0;
 const enquirer_1 = require("enquirer");
-const primivite_deps_1 = require("./primivite-deps");
+const primitive_deps_1 = require("./primitive-deps");
 const addDependentPrimitives = async (primitivesToCreate, shouldPrompt) => {
-    const dependentPrimitives = (0, primivite_deps_1.getDependentPrimitives)(primitivesToCreate);
+    const dependentPrimitives = (0, primitive_deps_1.getDependentPrimitives)(primitivesToCreate);
     for await (const primitive of dependentPrimitives) {
         const promptName = `install${primitive.charAt(0).toUpperCase() + primitive.slice(1)}`;
         const installPrimitive = shouldPrompt

package/src/generators/ui/generator.d.ts

@@ -1,12 +1,14 @@
 import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import { Config } from '../../utils/config';
+import { Primitive } from './primitives';
 import type { HlmUIGeneratorSchema } from './schema';
+type PrimitiveResponse = Primitive | 'all';
 export default function hlmUIGenerator(tree: Tree, options: HlmUIGeneratorSchema & {
     angularCli?: boolean;
 }): Promise<GeneratorCallback>;
 export declare function createPrimitiveLibraries(response: {
-    primitives: string[];
-}, availablePrimitiveNames: string[], availablePrimitives: PrimitiveDefinitions, tree: Tree, options: HlmUIGeneratorSchema & {
+    primitives: PrimitiveResponse[];
+}, availablePrimitiveNames: Primitive[], availablePrimitives: PrimitiveDefinitions, tree: Tree, options: HlmUIGeneratorSchema & {
     angularCli?: boolean;
     installPeerDependencies?: boolean;
 }, config: Config): Promise<GeneratorCallback[]>;

package/src/generators/ui/generator.js

@@ -45,7 +45,12 @@ async function hlmUIGenerator(tree, options) {
         componentsPath: options.directory,
     });
     const availablePrimitives = await Promise.resolve().then(() => __importStar(require('./supported-ui-libraries.json'))).then((m) => m.default);
-    const availablePrimitiveNames = [...Object.keys(availablePrimitives), 'collapsible', 'menubar', 'contextmenu'];
+    const availablePrimitiveNames = [
+        ...Object.keys(availablePrimitives),
+        'collapsible',
+        'menubar',
+        'context-menu',
+    ];
     let response = { primitives: [] };
     if (options.name && availablePrimitiveNames.includes(options.name)) {
         response.primitives.push(options.name);
@@ -66,7 +71,7 @@ async function createPrimitiveLibraries(response, availablePrimitiveNames, avail
     const allPrimitivesSelected = response.primitives.includes('all');
     const primitivesToCreate = allPrimitivesSelected ? availablePrimitiveNames : response.primitives;
     const tasks = [];
-    if (!response.primitives.includes('all') || options.installPeerDependencies) {
+    if (!response.primitives.includes('all') && options.installPeerDependencies) {
         await (0, add_dependent_primitive_1.addDependentPrimitives)(primitivesToCreate, false);
     }
     await replaceContextAndMenuBar(primitivesToCreate, allPrimitivesSelected);
@@ -98,7 +103,7 @@ async function createPrimitiveLibraries(response, availablePrimitiveNames, avail
     return tasks;
 }
 const replaceContextAndMenuBar = async (primtivesToCreate, silent = false) => {
-    const contextIndex = primtivesToCreate.indexOf('contextmenu');
+    const contextIndex = primtivesToCreate.indexOf('context-menu');
     if (contextIndex >= 0) {
         if (!silent) {
             await (0, enquirer_1.prompt)({

package/src/generators/ui/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/ui/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/ui/generator.ts"],"names":[],"mappings":"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"}

package/src/generators/ui/libs/ui-accordion-helm/files/lib/hlm-accordion-icon.directive.ts.template

@@ -2,7 +2,7 @@ import { Directive, computed, input } from '@angular/core';
 import { provideIcons } from '@ng-icons/core';
 import { lucideChevronDown } from '@ng-icons/lucide';
 import { hlm } from '@spartan-ng/brain/core';
-import { provideHlmIconConfig } from '@spartan-ng/ui-icon-helm';
+import { provideHlmIconConfig } from '@spartan-ng/helm/icon';
 import type { ClassValue } from 'clsx';
 
 @Directive({

package/src/generators/ui/libs/ui-alert-dialog-helm/files/lib/hlm-alert-dialog-action-button.directive.ts.template

@@ -1,5 +1,5 @@
 import { Directive } from '@angular/core';
-import { HlmButtonDirective } from '@spartan-ng/ui-button-helm';
+import { HlmButtonDirective } from '@spartan-ng/helm/button';
 
 @Directive({
 	selector: 'button[hlmAlertDialogAction]',

package/src/generators/ui/libs/ui-alert-dialog-helm/files/lib/hlm-alert-dialog-cancel-button.directive.ts.template

@@ -1,6 +1,6 @@
 import { Directive, computed, input } from '@angular/core';
 import { hlm } from '@spartan-ng/brain/core';
-import { HlmButtonDirective, provideBrnButtonConfig } from '@spartan-ng/ui-button-helm';
+import { HlmButtonDirective, provideBrnButtonConfig } from '@spartan-ng/helm/button';
 import type { ClassValue } from 'clsx';
 
 @Directive({

package/src/generators/ui/libs/ui-alert-dialog-helm/generator.js

@@ -6,9 +6,9 @@ const generator_1 = tslib_1.__importDefault(require("../../../base/generator"));
 async function generator(tree, options) {
     return await (0, generator_1.default)(tree, {
         ...options,
-        primitiveName: 'alertdialog',
+        primitiveName: 'alert-dialog',
         internalName: 'ui-alert-dialog-helm',
-        publicName: 'ui-alertdialog-helm',
+        publicName: 'ui-alert-dialog-helm',
     });
 }
 //# sourceMappingURL=generator.js.map

package/src/generators/ui/libs/ui-alert-dialog-helm/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../libs/cli/src/generators/ui/libs/ui-alert-dialog-helm/generator.ts"],"names":[],"mappings":";;AAIA,8BAOC;;AAVD,gFAAuD;AAGhD,KAAK,UAAU,SAAS,CAAC,IAAU,EAAE,OAA+B;IAC1E,OAAO,MAAM,IAAA,mBAAgB,EAAC,IAAI,EAAE;QACnC,GAAG,OAAO;QACV,aAAa,EAAE,aAAa;QAC5B,YAAY,EAAE,sBAAsB;QACpC,UAAU,EAAE,qBAAqB;KACjC,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../libs/cli/src/generators/ui/libs/ui-alert-dialog-helm/generator.ts"],"names":[],"mappings":";;AAIA,8BAOC;;AAVD,gFAAuD;AAGhD,KAAK,UAAU,SAAS,CAAC,IAAU,EAAE,OAA+B;IAC1E,OAAO,MAAM,IAAA,mBAAgB,EAAC,IAAI,EAAE;QACnC,GAAG,OAAO;QACV,aAAa,EAAE,cAAc;QAC7B,YAAY,EAAE,sBAAsB;QACpC,UAAU,EAAE,sBAAsB;KAClC,CAAC,CAAC;AACJ,CAAC"}