@spartan-ng/cli 0.0.1-alpha.365 → 0.0.1-alpha.367

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@spartan-ng/cli",
-  "version": "0.0.1-alpha.365",
+  "version": "0.0.1-alpha.367",
   "type": "commonjs",
   "dependencies": {
     "@nx/js": "^19.1.0",
     "@nx/devkit": "^19.1.0",
     "@nx/angular": "^19.1.0",
     "enquirer": "2.3.6",
-    "semver": "7.5.4"
+    "semver": "7.5.4",
+    "jsonc-eslint-parser": "^2.1.0"
   },
   "peerDependencies": {
     "tslib": "^2.3.0"
@@ -18,5 +19,6 @@
   "publishConfig": {
     "access": "public"
   },
+  "types": "./src/index.d.ts",
   "main": "./src/index.js"
 }

package/src/generators/base/generator.js

@@ -1,42 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hlmBaseGenerator = void 0;
+exports.hlmBaseGenerator = hlmBaseGenerator;
 const tslib_1 = require("tslib");
-const path = require("node:path");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const ts_config_1 = require("@nx/js/src/utils/typescript/ts-config");
+const path = tslib_1.__importStar(require("node:path"));
 const version_utils_1 = require("../../utils/version-utils");
 const build_dependency_array_1 = require("./lib/build-dependency-array");
 const get_target_library_directory_1 = require("./lib/get-target-library-directory");
 const initialize_angular_library_1 = require("./lib/initialize-angular-library");
 const versions_1 = require("./versions");
-function hlmBaseGenerator(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const tasks = [];
-        const targetLibDir = (0, get_target_library_directory_1.getTargetLibraryDirectory)(options, tree);
-        const existingPathsByAlias = (_a = (0, ts_config_1.readTsConfigPaths)((0, ts_config_1.getRootTsConfigPathInTree)(tree))) !== null && _a !== void 0 ? _a : {};
-        const tsConfigAliasToUse = `@spartan-ng/${options.publicName}`;
-        if (Object.keys(existingPathsByAlias).includes(tsConfigAliasToUse)) {
-            console.log(`Skipping ${tsConfigAliasToUse}. It's already installed!`);
-            return (0, devkit_1.runTasksInSerial)(...tasks);
-        }
-        if (options.angularCli) {
-            (0, js_1.addTsConfigPath)(tree, tsConfigAliasToUse, [`.${path.sep}${(0, devkit_1.joinPathFragments)(targetLibDir, 'src', 'index.ts')}`]);
-        }
-        else {
-            tasks.push(yield (0, initialize_angular_library_1.initializeAngularLibrary)(tree, options));
-        }
-        (0, devkit_1.generateFiles)(tree, path.join(__dirname, '..', 'ui', 'libs', options.internalName, 'files'), path.join(targetLibDir, 'src'), options);
-        const angularVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core', versions_1.FALLBACK_ANGULAR_VERSION, true);
-        const existingCdkVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/cdk', versions_1.FALLBACK_ANGULAR_VERSION, true);
-        const dependencies = (0, build_dependency_array_1.buildDependencyArray)(options, angularVersion, existingCdkVersion);
-        const devDependencies = (0, build_dependency_array_1.buildDevDependencyArray)();
-        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies));
+async function hlmBaseGenerator(tree, options) {
+    const tasks = [];
+    const targetLibDir = (0, get_target_library_directory_1.getTargetLibraryDirectory)(options, tree);
+    const existingPathsByAlias = (0, ts_config_1.readTsConfigPaths)((0, ts_config_1.getRootTsConfigPathInTree)(tree)) ?? {};
+    const tsConfigAliasToUse = `@spartan-ng/${options.publicName}`;
+    if (Object.keys(existingPathsByAlias).includes(tsConfigAliasToUse)) {
+        console.log(`Skipping ${tsConfigAliasToUse}. It's already installed!`);
         return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+    }
+    if (options.angularCli) {
+        (0, js_1.addTsConfigPath)(tree, tsConfigAliasToUse, [`.${path.sep}${(0, devkit_1.joinPathFragments)(targetLibDir, 'src', 'index.ts')}`]);
+    }
+    else {
+        tasks.push(await (0, initialize_angular_library_1.initializeAngularLibrary)(tree, options));
+    }
+    (0, devkit_1.generateFiles)(tree, path.join(__dirname, '..', 'ui', 'libs', options.internalName, 'files'), path.join(targetLibDir, 'src'), options);
+    const angularVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core', versions_1.FALLBACK_ANGULAR_VERSION, true);
+    const existingCdkVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/cdk', versions_1.FALLBACK_ANGULAR_VERSION, true);
+    const dependencies = (0, build_dependency_array_1.buildDependencyArray)(options, angularVersion, existingCdkVersion);
+    const devDependencies = (0, build_dependency_array_1.buildDevDependencyArray)();
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies));
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.hlmBaseGenerator = hlmBaseGenerator;
 exports.default = hlmBaseGenerator;
 //# sourceMappingURL=generator.js.map

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":";;;;AAAA,kCAAkC;AAClC,uCAOoB;AACpB,+BAAyC;AACzC,qEAAqG;AACrG,6DAAuE;AACvE,yEAA6F;AAC7F,qFAA+E;AAC/E,iFAA4E;AAE5E,yCAAsD;AAEtD,SAAsB,gBAAgB,CAAC,IAAU,EAAE,OAA+B;;;QACjF,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,YAAY,GAAG,IAAA,wDAAyB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAE9D,MAAM,oBAAoB,GAAG,MAAA,IAAA,6BAAiB,EAAC,IAAA,qCAAyB,EAAC,IAAI,CAAC,CAAC,mCAAI,EAAE,CAAC;QACtF,MAAM,kBAAkB,GAAG,eAAe,OAAO,CAAC,UAAU,EAAE,CAAC;QAE/D,IAAI,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACpE,OAAO,CAAC,GAAG,CAAC,YAAY,kBAAkB,2BAA2B,CAAC,CAAC;YACvE,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;QACnC,CAAC;QAED,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACxB,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;QAClH,CAAC;aAAM,CAAC;YACP,KAAK,CAAC,IAAI,CAAC,MAAM,IAAA,qDAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QAC3D,CAAC;QAED,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;QAEF,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,eAAe,EAAE,mCAAwB,EAAE,IAAI,CAAC,CAAC;QACzG,MAAM,kBAAkB,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,cAAc,EAAE,mCAAwB,EAAE,IAAI,CAAC,CAAC;QAC5G,MAAM,YAAY,GAAG,IAAA,6CAAoB,EAAC,OAAO,EAAE,cAAc,EAAE,kBAAkB,CAAC,CAAC;QACvF,MAAM,eAAe,GAAG,IAAA,gDAAuB,GAAE,CAAC;QAElD,KAAK,CAAC,IAAI,CAAC,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC;QAC9E,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACnC,CAAC;CAAA;AAhCD,4CAgCC;AAED,kBAAe,gBAAgB,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/base/generator.ts"],"names":[],"mappings":";;AAkBA,4CAgCC;;AAlDD,uCAOoB;AACpB,+BAAyC;AACzC,qEAAqG;AACrG,wDAAkC;AAClC,6DAAuE;AACvE,yEAA6F;AAC7F,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,6BAAiB,EAAC,IAAA,qCAAyB,EAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;IACtF,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,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/build-dependency-array.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildDevDependencyArray = exports.buildDependencyArray = void 0;
+exports.buildDependencyArray = buildDependencyArray;
+exports.buildDevDependencyArray = buildDevDependencyArray;
 const versions_1 = require("../versions");
 const BRAIN_DEPENDENCY_MAP = {
     accordion: versions_1.SPARTAN_ACCORDION_BRAIN_VERSION,
@@ -29,27 +30,26 @@ const DEPENDENT_ON_FORMS = ['input', 'select'];
 function buildDependencyArray(options, angularVersion, existingCdkVersion) {
     let dependencies = {
         '@spartan-ng/ui-core': versions_1.SPARTAN_CORE_VERSION,
-        '@angular/cdk': existingCdkVersion !== null && existingCdkVersion !== void 0 ? existingCdkVersion : angularVersion,
+        '@angular/cdk': existingCdkVersion ?? angularVersion,
     };
     if (options.peerDependencies) {
-        dependencies = Object.assign(Object.assign({}, dependencies), options.peerDependencies);
+        dependencies = { ...dependencies, ...options.peerDependencies };
     }
     const brainDependencyVersion = BRAIN_DEPENDENCY_MAP[options.primitiveName];
     if (brainDependencyVersion) {
-        dependencies = Object.assign(Object.assign({}, dependencies), { [`@spartan-ng/ui-${options.primitiveName}-brain`]: brainDependencyVersion });
+        dependencies = { ...dependencies, [`@spartan-ng/ui-${options.primitiveName}-brain`]: brainDependencyVersion };
     }
     if (brainDependencyVersion && DEPENDENT_ON_DIALOG.includes(options.primitiveName)) {
-        dependencies = Object.assign(Object.assign({}, dependencies), { '@spartan-ng/ui-dialog-brain': brainDependencyVersion });
+        dependencies = { ...dependencies, '@spartan-ng/ui-dialog-brain': brainDependencyVersion };
     }
     if (brainDependencyVersion && DEPENDENT_ON_FORMS.includes(options.primitiveName)) {
-        dependencies = Object.assign(Object.assign({}, dependencies), { '@spartan-ng/ui-forms-brain': brainDependencyVersion });
+        dependencies = { ...dependencies, '@spartan-ng/ui-forms-brain': brainDependencyVersion };
     }
     if (options.primitiveName === 'icon') {
-        dependencies = Object.assign(Object.assign({}, dependencies), { '@ng-icons/core': versions_1.NG_ICONS_VERSION });
+        dependencies = { ...dependencies, '@ng-icons/core': versions_1.NG_ICONS_VERSION };
     }
     return dependencies;
 }
-exports.buildDependencyArray = buildDependencyArray;
 function buildDevDependencyArray() {
     return {
         'tailwind-merge': versions_1.TAILWIND_MERGE_VERSION,
@@ -57,5 +57,4 @@ function buildDevDependencyArray() {
         'tailwindcss-animate': versions_1.TAILWIND_ANIMATE_VERSION,
     };
 }
-exports.buildDevDependencyArray = buildDevDependencyArray;
 //# sourceMappingURL=build-dependency-array.js.map

package/src/generators/base/lib/build-dependency-array.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-dependency-array.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/base/lib/build-dependency-array.ts"],"names":[],"mappings":";;;AACA,0CAyBqB;AAErB,MAAM,oBAAoB,GAAG;IAC5B,SAAS,EAAE,0CAA+B;IAC1C,WAAW,EAAE,6CAAkC;IAC/C,MAAM,EAAE,uCAA4B;IACpC,OAAO,EAAE,wCAA6B;IACtC,MAAM,EAAE,uCAA4B;IACpC,SAAS,EAAE,0CAA+B;IAC1C,KAAK,EAAE,sCAA2B;IAClC,IAAI,EAAE,qCAA0B;IAChC,OAAO,EAAE,wCAA6B;IACtC,QAAQ,EAAE,yCAA8B;IACxC,UAAU,EAAE,4CAAiC;IAC7C,MAAM,EAAE,uCAA4B;IACpC,SAAS,EAAE,0CAA+B;IAC1C,KAAK,EAAE,sCAA2B;IAClC,MAAM,EAAE,iCAAsB;IAC9B,IAAI,EAAE,+BAAoB;IAC1B,KAAK,EAAE,gCAAqB;IAC5B,MAAM,EAAE,iCAAsB;IAC9B,SAAS,EAAE,oCAAyB;CACpC,CAAC;AAEF,mDAAmD;AACnD,MAAM,mBAAmB,GAAG,CAAC,aAAa,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AAChE,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAE/C,SAAgB,oBAAoB,CACnC,OAA+B,EAC/B,cAAsB,EACtB,kBAA0B;IAE1B,IAAI,YAAY,GAA2B;QAC1C,qBAAqB,EAAE,+BAAoB;QAC3C,cAAc,EAAE,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAAI,cAAc;KACpD,CAAC;IAEF,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC9B,YAAY,mCAAQ,YAAY,GAAK,OAAO,CAAC,gBAAgB,CAAE,CAAC;IACjE,CAAC;IACD,MAAM,sBAAsB,GAAG,oBAAoB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC3E,IAAI,sBAAsB,EAAE,CAAC;QAC5B,YAAY,mCAAQ,YAAY,KAAE,CAAC,kBAAkB,OAAO,CAAC,aAAa,QAAQ,CAAC,EAAE,sBAAsB,GAAE,CAAC;IAC/G,CAAC;IACD,IAAI,sBAAsB,IAAI,mBAAmB,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACnF,YAAY,mCAAQ,YAAY,KAAE,6BAA6B,EAAE,sBAAsB,GAAE,CAAC;IAC3F,CAAC;IACD,IAAI,sBAAsB,IAAI,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QAClF,YAAY,mCAAQ,YAAY,KAAE,4BAA4B,EAAE,sBAAsB,GAAE,CAAC;IAC1F,CAAC;IACD,IAAI,OAAO,CAAC,aAAa,KAAK,MAAM,EAAE,CAAC;QACtC,YAAY,mCAAQ,YAAY,KAAE,gBAAgB,EAAE,2BAAgB,GAAE,CAAC;IACxE,CAAC;IACD,OAAO,YAAY,CAAC;AACrB,CAAC;AA3BD,oDA2BC;AAED,SAAgB,uBAAuB;IACtC,OAAO;QACN,gBAAgB,EAAE,iCAAsB;QACxC,WAAW,EAAE,8BAAmB;QAChC,qBAAqB,EAAE,mCAAwB;KAC/C,CAAC;AACH,CAAC;AAND,0DAMC"}
+{"version":3,"file":"build-dependency-array.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/base/lib/build-dependency-array.ts"],"names":[],"mappings":";;AAsDA,oDA2BC;AAED,0DAMC;AAxFD,0CAyBqB;AAErB,MAAM,oBAAoB,GAAG;IAC5B,SAAS,EAAE,0CAA+B;IAC1C,WAAW,EAAE,6CAAkC;IAC/C,MAAM,EAAE,uCAA4B;IACpC,OAAO,EAAE,wCAA6B;IACtC,MAAM,EAAE,uCAA4B;IACpC,SAAS,EAAE,0CAA+B;IAC1C,KAAK,EAAE,sCAA2B;IAClC,IAAI,EAAE,qCAA0B;IAChC,OAAO,EAAE,wCAA6B;IACtC,QAAQ,EAAE,yCAA8B;IACxC,UAAU,EAAE,4CAAiC;IAC7C,MAAM,EAAE,uCAA4B;IACpC,SAAS,EAAE,0CAA+B;IAC1C,KAAK,EAAE,sCAA2B;IAClC,MAAM,EAAE,iCAAsB;IAC9B,IAAI,EAAE,+BAAoB;IAC1B,KAAK,EAAE,gCAAqB;IAC5B,MAAM,EAAE,iCAAsB;IAC9B,SAAS,EAAE,oCAAyB;CACpC,CAAC;AAEF,mDAAmD;AACnD,MAAM,mBAAmB,GAAG,CAAC,aAAa,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AAChE,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAE/C,SAAgB,oBAAoB,CACnC,OAA+B,EAC/B,cAAsB,EACtB,kBAA0B;IAE1B,IAAI,YAAY,GAA2B;QAC1C,qBAAqB,EAAE,+BAAoB;QAC3C,cAAc,EAAE,kBAAkB,IAAI,cAAc;KACpD,CAAC;IAEF,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC9B,YAAY,GAAG,EAAE,GAAG,YAAY,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IACjE,CAAC;IACD,MAAM,sBAAsB,GAAG,oBAAoB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC3E,IAAI,sBAAsB,EAAE,CAAC;QAC5B,YAAY,GAAG,EAAE,GAAG,YAAY,EAAE,CAAC,kBAAkB,OAAO,CAAC,aAAa,QAAQ,CAAC,EAAE,sBAAsB,EAAE,CAAC;IAC/G,CAAC;IACD,IAAI,sBAAsB,IAAI,mBAAmB,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACnF,YAAY,GAAG,EAAE,GAAG,YAAY,EAAE,6BAA6B,EAAE,sBAAsB,EAAE,CAAC;IAC3F,CAAC;IACD,IAAI,sBAAsB,IAAI,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QAClF,YAAY,GAAG,EAAE,GAAG,YAAY,EAAE,4BAA4B,EAAE,sBAAsB,EAAE,CAAC;IAC1F,CAAC;IACD,IAAI,OAAO,CAAC,aAAa,KAAK,MAAM,EAAE,CAAC;QACtC,YAAY,GAAG,EAAE,GAAG,YAAY,EAAE,gBAAgB,EAAE,2BAAgB,EAAE,CAAC;IACxE,CAAC;IACD,OAAO,YAAY,CAAC;AACrB,CAAC;AAED,SAAgB,uBAAuB;IACtC,OAAO;QACN,gBAAgB,EAAE,iCAAsB;QACxC,WAAW,EAAE,8BAAmB;QAChC,qBAAqB,EAAE,mCAAwB;KAC/C,CAAC;AACH,CAAC"}

package/src/generators/base/lib/get-target-library-directory.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTargetLibraryDirectory = void 0;
-const path = require("node:path");
+exports.getTargetLibraryDirectory = getTargetLibraryDirectory;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
+const path = tslib_1.__importStar(require("node:path"));
 function getTargetLibraryDirectory(options, tree) {
     const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    const libsDir = options.rootProject ? '.' : layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : (0, devkit_1.getWorkspaceLayout)(tree).libsDir;
+    const workspaceLayout = (0, devkit_1.getWorkspaceLayout)(tree);
+    const baseLibsDir = layoutDirectory ?? workspaceLayout.libsDir;
+    const libsDir = options.rootProject ? '.' : baseLibsDir;
     return path.join(libsDir, projectDirectory, options.publicName);
 }
-exports.getTargetLibraryDirectory = getTargetLibraryDirectory;
 //# sourceMappingURL=get-target-library-directory.js.map

package/src/generators/base/lib/get-target-library-directory.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-target-library-directory.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/base/lib/get-target-library-directory.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,uCAAmF;AAGnF,SAAgB,yBAAyB,CAAC,OAA+B,EAAE,IAAU;IACpF,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACxF,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;IAChG,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;AACjE,CAAC;AAJD,8DAIC"}
+{"version":3,"file":"get-target-library-directory.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/base/lib/get-target-library-directory.ts"],"names":[],"mappings":";;AAIA,8DAMC;;AAVD,uCAAmF;AACnF,wDAAkC;AAGlC,SAAgB,yBAAyB,CAAC,OAA+B,EAAE,IAAU;IACpF,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACxF,MAAM,eAAe,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,eAAe,IAAI,eAAe,CAAC,OAAO,CAAC;IAC/D,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC;IACxD,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;AACjE,CAAC"}

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

@@ -1,27 +1,45 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initializeAngularLibrary = void 0;
-const tslib_1 = require("tslib");
+exports.initializeAngularLibrary = initializeAngularLibrary;
 const devkit_1 = require("@nx/devkit");
-function initializeAngularLibrary(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield (yield Promise.resolve().then(() => require(
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        '@nx/angular/generators'))).libraryGenerator(tree, {
-            name: options.publicName,
-            skipFormat: true,
-            simpleName: true,
-            buildable: true,
-            projectNameAndRootFormat: 'as-provided',
-            importPath: `@spartan-ng/${options.publicName}`,
-            prefix: 'hlm',
-            skipModule: true,
-            standalone: false,
-            directory: (0, devkit_1.joinPathFragments)(options.directory, options.publicName),
-            tags: options.tags,
-        });
+async function initializeAngularLibrary(tree, options) {
+    return await (await Promise.resolve().then(() => __importStar(require(
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    '@nx/angular/generators')))).libraryGenerator(tree, {
+        name: options.publicName,
+        skipFormat: true,
+        simpleName: true,
+        buildable: true,
+        importPath: `@spartan-ng/${options.publicName}`,
+        prefix: 'hlm',
+        skipModule: true,
+        standalone: false,
+        directory: (0, devkit_1.joinPathFragments)(options.directory, options.publicName),
+        tags: options.tags,
     });
 }
-exports.initializeAngularLibrary = initializeAngularLibrary;
 //# sourceMappingURL=initialize-angular-library.js.map

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":";;;;AAAA,uCAAyD;AAGzD,SAAsB,wBAAwB,CAAC,IAAU,EAAE,OAA+B;;QACzF,OAAO,MAAM,CACZ;QACC,6DAA6D;QAC7D,aAAa;QACb,wBAAwB,EACxB,CACD,CAAC,gBAAgB,CAAC,IAAI,EAAE;YACxB,IAAI,EAAE,OAAO,CAAC,UAAU;YACxB,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,IAAI;YAChB,SAAS,EAAE,IAAI;YACf,wBAAwB,EAAE,aAAa;YACvC,UAAU,EAAE,eAAe,OAAO,CAAC,UAAU,EAAE;YAC/C,MAAM,EAAE,KAAK;YACb,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,KAAK;YACjB,SAAS,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC;YACnE,IAAI,EAAE,OAAO,CAAC,IAAI;SAClB,CAAC,CAAC;IACJ,CAAC;CAAA;AApBD,4DAoBC"}
+{"version":3,"file":"initialize-angular-library.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/base/lib/initialize-angular-library.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAGA,4DAmBC;AAtBD,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,UAAU,EAAE,KAAK;QACjB,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/base/versions.d.ts

@@ -1,26 +1,26 @@
 export declare const FALLBACK_ANGULAR_VERSION = "^18.0.0";
-export declare const NG_ICONS_VERSION = "^25.1.0";
-export declare const SPARTAN_ACCORDION_BRAIN_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_ALERT_DIALOG_BRAIN_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_AVATAR_BRAIN_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_COMMAND_BRAIN_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_COLLAPSIBLE_BRAIN_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_CORE_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_DIALOG_BRAIN_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_FORMFIELD_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_HOVERCARD_BRAIN_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_LABEL_BRAIN_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_MENU_BRAIN_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_POPOVER_BRAIN_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_PROGRESS_BRAIN_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_RADIO_GROUP_BRAIN_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_SELECT_BRAIN_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_SEPARATOR_BRAIN_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_SHEET_BRAIN_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_SWITCH_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_TABS_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_TABLE_VERSION = "0.0.1-alpha.355";
-export declare const SPARTAN_TOGGLE_VERSION = "0.0.1-alpha.355";
+export declare const NG_ICONS_VERSION = "^29.10.0";
+export declare const SPARTAN_ACCORDION_BRAIN_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_ALERT_DIALOG_BRAIN_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_AVATAR_BRAIN_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_COMMAND_BRAIN_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_COLLAPSIBLE_BRAIN_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_CORE_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_DIALOG_BRAIN_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_FORMFIELD_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_HOVERCARD_BRAIN_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_LABEL_BRAIN_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_MENU_BRAIN_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_POPOVER_BRAIN_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_PROGRESS_BRAIN_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_RADIO_GROUP_BRAIN_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_SELECT_BRAIN_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_SEPARATOR_BRAIN_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_SHEET_BRAIN_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_SWITCH_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_TABS_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_TABLE_VERSION = "0.0.1-alpha.357";
+export declare const SPARTAN_TOGGLE_VERSION = "0.0.1-alpha.357";
 export declare const TAILWIND_MERGE_VERSION = "^2.2.0";
 export declare const TAILWINDCSS_VERSION = "^3.0.2";
 export declare const TAILWIND_ANIMATE_VERSION = "^1.0.6";

package/src/generators/base/versions.js

@@ -4,29 +4,29 @@ exports.TAILWIND_ANIMATE_VERSION = exports.TAILWINDCSS_VERSION = exports.TAILWIN
 // angular dependency
 exports.FALLBACK_ANGULAR_VERSION = '^18.0.0';
 // ng-icon dependency
-exports.NG_ICONS_VERSION = '^25.1.0';
+exports.NG_ICONS_VERSION = '^29.10.0';
 // spartan dependencies
-exports.SPARTAN_ACCORDION_BRAIN_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_ALERT_DIALOG_BRAIN_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_AVATAR_BRAIN_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_COMMAND_BRAIN_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_COLLAPSIBLE_BRAIN_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_CORE_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_DIALOG_BRAIN_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_FORMFIELD_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_HOVERCARD_BRAIN_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_LABEL_BRAIN_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_MENU_BRAIN_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_POPOVER_BRAIN_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_PROGRESS_BRAIN_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_RADIO_GROUP_BRAIN_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_SELECT_BRAIN_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_SEPARATOR_BRAIN_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_SHEET_BRAIN_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_SWITCH_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_TABS_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_TABLE_VERSION = '0.0.1-alpha.355';
-exports.SPARTAN_TOGGLE_VERSION = '0.0.1-alpha.355';
+exports.SPARTAN_ACCORDION_BRAIN_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_ALERT_DIALOG_BRAIN_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_AVATAR_BRAIN_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_COMMAND_BRAIN_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_COLLAPSIBLE_BRAIN_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_CORE_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_DIALOG_BRAIN_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_FORMFIELD_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_HOVERCARD_BRAIN_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_LABEL_BRAIN_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_MENU_BRAIN_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_POPOVER_BRAIN_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_PROGRESS_BRAIN_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_RADIO_GROUP_BRAIN_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_SELECT_BRAIN_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_SEPARATOR_BRAIN_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_SHEET_BRAIN_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_SWITCH_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_TABS_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_TABLE_VERSION = '0.0.1-alpha.357';
+exports.SPARTAN_TOGGLE_VERSION = '0.0.1-alpha.357';
 // dev dependencies
 exports.TAILWIND_MERGE_VERSION = '^2.2.0';
 exports.TAILWINDCSS_VERSION = '^3.0.2';

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

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/base/versions.ts"],"names":[],"mappings":";;;AAAA,qBAAqB;AACR,QAAA,wBAAwB,GAAG,SAAS,CAAC;AAClD,qBAAqB;AACR,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC1C,uBAAuB;AACV,QAAA,+BAA+B,GAAG,iBAAiB,CAAC;AACpD,QAAA,kCAAkC,GAAG,iBAAiB,CAAC;AACvD,QAAA,4BAA4B,GAAG,iBAAiB,CAAC;AACjD,QAAA,6BAA6B,GAAG,iBAAiB,CAAC;AAClD,QAAA,iCAAiC,GAAG,iBAAiB,CAAC;AACtD,QAAA,oBAAoB,GAAG,iBAAiB,CAAC;AACzC,QAAA,4BAA4B,GAAG,iBAAiB,CAAC;AACjD,QAAA,yBAAyB,GAAG,iBAAiB,CAAC;AAC9C,QAAA,+BAA+B,GAAG,iBAAiB,CAAC;AACpD,QAAA,2BAA2B,GAAG,iBAAiB,CAAC;AAChD,QAAA,0BAA0B,GAAG,iBAAiB,CAAC;AAC/C,QAAA,6BAA6B,GAAG,iBAAiB,CAAC;AAClD,QAAA,8BAA8B,GAAG,iBAAiB,CAAC;AACnD,QAAA,iCAAiC,GAAG,iBAAiB,CAAC;AACtD,QAAA,4BAA4B,GAAG,iBAAiB,CAAC;AACjD,QAAA,+BAA+B,GAAG,iBAAiB,CAAC;AACpD,QAAA,2BAA2B,GAAG,iBAAiB,CAAC;AAChD,QAAA,sBAAsB,GAAG,iBAAiB,CAAC;AAC3C,QAAA,oBAAoB,GAAG,iBAAiB,CAAC;AACzC,QAAA,qBAAqB,GAAG,iBAAiB,CAAC;AAC1C,QAAA,sBAAsB,GAAG,iBAAiB,CAAC;AACxD,mBAAmB;AACN,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,wBAAwB,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/base/versions.ts"],"names":[],"mappings":";;;AAAA,qBAAqB;AACR,QAAA,wBAAwB,GAAG,SAAS,CAAC;AAClD,qBAAqB;AACR,QAAA,gBAAgB,GAAG,UAAU,CAAC;AAC3C,uBAAuB;AACV,QAAA,+BAA+B,GAAG,iBAAiB,CAAC;AACpD,QAAA,kCAAkC,GAAG,iBAAiB,CAAC;AACvD,QAAA,4BAA4B,GAAG,iBAAiB,CAAC;AACjD,QAAA,6BAA6B,GAAG,iBAAiB,CAAC;AAClD,QAAA,iCAAiC,GAAG,iBAAiB,CAAC;AACtD,QAAA,oBAAoB,GAAG,iBAAiB,CAAC;AACzC,QAAA,4BAA4B,GAAG,iBAAiB,CAAC;AACjD,QAAA,yBAAyB,GAAG,iBAAiB,CAAC;AAC9C,QAAA,+BAA+B,GAAG,iBAAiB,CAAC;AACpD,QAAA,2BAA2B,GAAG,iBAAiB,CAAC;AAChD,QAAA,0BAA0B,GAAG,iBAAiB,CAAC;AAC/C,QAAA,6BAA6B,GAAG,iBAAiB,CAAC;AAClD,QAAA,8BAA8B,GAAG,iBAAiB,CAAC;AACnD,QAAA,iCAAiC,GAAG,iBAAiB,CAAC;AACtD,QAAA,4BAA4B,GAAG,iBAAiB,CAAC;AACjD,QAAA,+BAA+B,GAAG,iBAAiB,CAAC;AACpD,QAAA,2BAA2B,GAAG,iBAAiB,CAAC;AAChD,QAAA,sBAAsB,GAAG,iBAAiB,CAAC;AAC3C,QAAA,oBAAoB,GAAG,iBAAiB,CAAC;AACzC,QAAA,qBAAqB,GAAG,iBAAiB,CAAC;AAC1C,QAAA,sBAAsB,GAAG,iBAAiB,CAAC;AACxD,mBAAmB;AACN,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,wBAAwB,GAAG,QAAQ,CAAC"}

package/src/generators/theme/compat.js

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

package/src/generators/theme/compat.js.map

@@ -1 +1 @@
-{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/theme/compat.ts"],"names":[],"mappings":";;AAAA,uCAAgD;AAChD,2CAAyD;AAEzD,kBAAe,IAAA,2BAAkB,EAAC,mBAA8B,CAAC,CAAC"}
+{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/theme/compat.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAChD,oEAAyD;AAEzD,kBAAe,IAAA,2BAAkB,EAAC,mBAA8B,CAAC,CAAC"}

package/src/generators/theme/generator.js

@@ -1,59 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
+exports.default = addThemeToApplicationGenerator;
 const enquirer_1 = require("enquirer");
 const get_project_names_1 = require("../../utils/get-project-names");
 const add_theme_to_application_styles_1 = require("./libs/add-theme-to-application-styles");
 const supported_theme_generator_map_1 = require("./libs/supported-theme-generator-map");
-function addThemeToApplicationGenerator(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { projects, projectNames } = (0, get_project_names_1.getProjectsAndNames)(tree);
-        const response = yield (0, enquirer_1.prompt)({
+async function addThemeToApplicationGenerator(tree) {
+    const { projects, projectNames } = (0, get_project_names_1.getProjectsAndNames)(tree);
+    const response = await (0, enquirer_1.prompt)({
+        type: 'select',
+        required: true,
+        name: 'app',
+        message: 'Choose which application you want to add the theme to:',
+        choices: projectNames,
+    });
+    const project = projects.get(response.app);
+    if (!project)
+        return;
+    const themeOptions = await (0, enquirer_1.prompt)([
+        {
             type: 'select',
             required: true,
-            name: 'app',
-            message: 'Choose which application you want to add the theme to:',
-            choices: projectNames,
-        });
-        const project = projects.get(response.app);
-        if (!project)
-            return;
-        const themeOptions = yield (0, enquirer_1.prompt)([
-            {
-                type: 'select',
-                required: true,
-                name: 'theme',
-                message: 'Choose which theme to apply. You can always re-run this generator and add a custom prefix to add other themes.',
-                choices: supported_theme_generator_map_1.SupportedThemes,
-            },
-            {
-                type: 'select',
-                required: true,
-                name: 'radius',
-                initial: 2,
-                message: 'Which corner radius do you want to use with your theme:',
-                choices: [...supported_theme_generator_map_1.SupportedRadii],
-            },
-            {
-                type: 'input',
-                name: 'stylesEntryPoint',
-                message: "Path to the styles entry point relative to the workspace root. If not provided the generator will do its best to find it and it will error if it can't.",
-            },
-            {
-                type: 'input',
-                name: 'prefix',
-                message: "Prefix class name applied to your theme's style definitions: e.g., theme-rose, theme-zinc. Leave empty for global theme.",
-            },
-        ]);
-        (0, add_theme_to_application_styles_1.addThemeToApplicationStyles)(tree, {
-            project: project.name,
-            radius: Number.parseFloat(themeOptions.radius),
-            theme: themeOptions.theme,
-            addCdkStyles: themeOptions.addCdkStyles,
-            stylesEntryPoint: themeOptions.stylesEntryPoint,
-            prefix: themeOptions.prefix,
-        }, project);
-    });
+            name: 'theme',
+            message: 'Choose which theme to apply. You can always re-run this generator and add a custom prefix to add other themes.',
+            choices: supported_theme_generator_map_1.SupportedThemes,
+        },
+        {
+            type: 'select',
+            required: true,
+            name: 'radius',
+            initial: 2,
+            message: 'Which corner radius do you want to use with your theme:',
+            choices: [...supported_theme_generator_map_1.SupportedRadii],
+        },
+        {
+            type: 'input',
+            name: 'stylesEntryPoint',
+            message: "Path to the styles entry point relative to the workspace root. If not provided the generator will do its best to find it and it will error if it can't.",
+        },
+        {
+            type: 'input',
+            name: 'prefix',
+            message: "Prefix class name applied to your theme's style definitions: e.g., theme-rose, theme-zinc. Leave empty for global theme.",
+        },
+    ]);
+    (0, add_theme_to_application_styles_1.addThemeToApplicationStyles)(tree, {
+        project: project.name,
+        radius: Number.parseFloat(themeOptions.radius),
+        theme: themeOptions.theme,
+        addCdkStyles: themeOptions.addCdkStyles,
+        stylesEntryPoint: themeOptions.stylesEntryPoint,
+        prefix: themeOptions.prefix,
+    }, project);
 }
-exports.default = addThemeToApplicationGenerator;
 //# sourceMappingURL=generator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/theme/generator.ts"],"names":[],"mappings":";;;AACA,uCAAkC;AAClC,qEAAoE;AACpE,4FAAqF;AACrF,wFAA4G;AAE5G,SAA8B,8BAA8B,CAAC,IAAU;;QACtE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAA,uCAAmB,EAAC,IAAI,CAAC,CAAC;QAE7D,MAAM,QAAQ,GAAoB,MAAM,IAAA,iBAAM,EAAC;YAC9C,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,wDAAwD;YACjE,OAAO,EAAE,YAAY;SACrB,CAAC,CAAC;QACH,MAAM,OAAO,GAAqC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAE7E,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,MAAM,YAAY,GAMd,MAAM,IAAA,iBAAM,EAAC;YAChB;gBACC,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,OAAO;gBACb,OAAO,EACN,gHAAgH;gBACjH,OAAO,EAAE,+CAAe;aACxB;YACD;gBACC,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,yDAAyD;gBAClE,OAAO,EAAE,CAAC,GAAG,8CAAc,CAAC;aAC5B;YACD;gBACC,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,kBAAkB;gBACxB,OAAO,EACN,yJAAyJ;aAC1J;YACD;gBACC,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,QAAQ;gBACd,OAAO,EACN,0HAA0H;aAC3H;SACD,CAAC,CAAC;QAEH,IAAA,6DAA2B,EAC1B,IAAI,EACJ;YACC,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC;YAC9C,KAAK,EAAE,YAAY,CAAC,KAAK;YACzB,YAAY,EAAE,YAAY,CAAC,YAAY;YACvC,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;YAC/C,MAAM,EAAE,YAAY,CAAC,MAAM;SAC3B,EACD,OAAO,CACP,CAAC;IACH,CAAC;CAAA;AA/DD,iDA+DC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/theme/generator.ts"],"names":[],"mappings":";;AAMA,iDA+DC;AApED,uCAAkC;AAClC,qEAAoE;AACpE,4FAAqF;AACrF,wFAA4G;AAE7F,KAAK,UAAU,8BAA8B,CAAC,IAAU;IACtE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAA,uCAAmB,EAAC,IAAI,CAAC,CAAC;IAE7D,MAAM,QAAQ,GAAoB,MAAM,IAAA,iBAAM,EAAC;QAC9C,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,KAAK;QACX,OAAO,EAAE,wDAAwD;QACjE,OAAO,EAAE,YAAY;KACrB,CAAC,CAAC;IACH,MAAM,OAAO,GAAqC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAE7E,IAAI,CAAC,OAAO;QAAE,OAAO;IAErB,MAAM,YAAY,GAMd,MAAM,IAAA,iBAAM,EAAC;QAChB;YACC,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;YACb,OAAO,EACN,gHAAgH;YACjH,OAAO,EAAE,+CAAe;SACxB;QACD;YACC,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,yDAAyD;YAClE,OAAO,EAAE,CAAC,GAAG,8CAAc,CAAC;SAC5B;QACD;YACC,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,kBAAkB;YACxB,OAAO,EACN,yJAAyJ;SAC1J;QACD;YACC,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,QAAQ;YACd,OAAO,EACN,0HAA0H;SAC3H;KACD,CAAC,CAAC;IAEH,IAAA,6DAA2B,EAC1B,IAAI,EACJ;QACC,OAAO,EAAE,OAAO,CAAC,IAAI;QACrB,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC;QAC9C,KAAK,EAAE,YAAY,CAAC,KAAK;QACzB,YAAY,EAAE,YAAY,CAAC,YAAY;QACvC,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;QAC/C,MAAM,EAAE,YAAY,CAAC,MAAM;KAC3B,EACD,OAAO,CACP,CAAC;AACH,CAAC"}

package/src/generators/theme/libs/add-theme-to-application-styles.js

@@ -2,7 +2,7 @@
 // All credit goes to the incredible folks at Nx who use this code to update the app styles when adding tailwind
 // Check out the code here: https://github.com/nrwl/nx/blob/master/packages/angular/src/generators/setup-tailwind/lib/update-application-styles.ts
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addThemeToApplicationStyles = void 0;
+exports.addThemeToApplicationStyles = addThemeToApplicationStyles;
 const devkit_1 = require("@nx/devkit");
 const supported_theme_generator_map_1 = require("./supported-theme-generator-map");
 function addThemeToApplicationStyles(tree, options, project) {
@@ -32,24 +32,28 @@ function addThemeToApplicationStyles(tree, options, project) {
     ${stylesEntryPointContent}
 
     ${rootFontSans}
-    ${supported_theme_generator_map_1.SupportedThemeGeneratorMap[options.theme](options.radius, prefix)}`);
+    ${supported_theme_generator_map_1.SupportedThemeGeneratorMap[options.theme](options.radius, prefix)}
+
+    @layer base {
+      * {
+        @apply border-border;
+      }
+    }`);
 }
-exports.addThemeToApplicationStyles = addThemeToApplicationStyles;
 function findStylesEntryPoint(tree, project) {
-    var _a, _b, _c, _d, _e, _f;
     // first check for common names
     const possibleStylesEntryPoints = [
-        (0, devkit_1.joinPathFragments)((_a = project.sourceRoot) !== null && _a !== void 0 ? _a : project.root, 'styles.css'),
-        (0, devkit_1.joinPathFragments)((_b = project.sourceRoot) !== null && _b !== void 0 ? _b : project.root, 'styles.scss'),
-        (0, devkit_1.joinPathFragments)((_c = project.sourceRoot) !== null && _c !== void 0 ? _c : project.root, 'styles.sass'),
-        (0, devkit_1.joinPathFragments)((_d = project.sourceRoot) !== null && _d !== void 0 ? _d : project.root, 'styles.less'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot ?? project.root, 'styles.css'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot ?? project.root, 'styles.scss'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot ?? project.root, 'styles.sass'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot ?? project.root, 'styles.less'),
     ];
     const stylesEntryPoint = possibleStylesEntryPoints.find((s) => tree.exists(s));
     if (stylesEntryPoint) {
         return stylesEntryPoint;
     }
     // then check for the specified styles in the build configuration if it exists
-    const styles = (_f = (_e = project.targets) === null || _e === void 0 ? void 0 : _e.build.options) === null || _f === void 0 ? void 0 : _f.styles;
+    const styles = project.targets?.build.options?.styles;
     if (!styles) {
         return undefined;
     }

package/src/generators/theme/libs/add-theme-to-application-styles.js.map

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