@koobiq/components 18.7.0 → 18.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@koobiq/components",
-    "version": "18.7.0",
+    "version": "18.7.1",
     "description": "koobiq",
     "repository": {
         "type": "git",
@@ -24,9 +24,9 @@
         "@angular/cdk": "^18.0.0",
         "@angular/core": "^18.0.0",
         "@angular/forms": "^18.0.0",
-        "@koobiq/cdk": "18.7.0",
-        "@koobiq/angular-moment-adapter": "18.7.0",
-        "@koobiq/angular-luxon-adapter": "18.7.0",
+        "@koobiq/cdk": "18.7.1",
+        "@koobiq/angular-moment-adapter": "18.7.1",
+        "@koobiq/angular-luxon-adapter": "18.7.1",
         "@koobiq/date-formatter": "^3.1.3",
         "@koobiq/icons": "^9.0.0",
         "@koobiq/tokens-builder": "3.8.1",

package/schematics/migrations/css-selectors/index.js

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var path = require('path');
-var utils_packageConfig = require('../../package-config-D0ROjo4J.js');
+var utils_packageConfig = require('../../utils/package-config.js');
 var migrations_cssSelectors_data = require('./data.js');
 require('@angular-devkit/schematics');
 require('@schematics/angular/utility');
+require('../../utils/messages.js');
 
 function _interopNamespaceDefault(e) {
     var n = Object.create(null);
@@ -84,9 +85,9 @@ function getBaseReplacements(filePath, foundSelectors) {
     const parsedFilePath = path__namespace.relative(__dirname, `.${filePath}`).replace(/\\/g, '/');
     return `
 -------------------------
-Please pay attention! Found deprecated сss-selectors in file: 
+Please pay attention! Found deprecated сss-selectors in file:
 ${parsedFilePath}
-Replace with specified rules: 
+Replace with specified rules:
 ${foundSelectors.map(({ replace, replaceWith }) => `\t${replace} -> \t${replaceWith}`).join('\n')}
 -------------------------
     `;

package/schematics/migrations/deprecated-icons/index.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var path = require('path');
-var utils_packageConfig = require('../../package-config-D0ROjo4J.js');
+var utils_messages = require('../../utils/messages.js');
+var utils_packageConfig = require('../../utils/package-config.js');
 var migrations_deprecatedIcons_data = require('./data.js');
 require('@angular-devkit/schematics');
 require('@schematics/angular/utility');
@@ -50,7 +51,7 @@ function deprecatedIcons(options) {
                 const foundIcons = migrations_deprecatedIcons_data.iconsMapping.filter(({ replace }) => newContent.indexOf(replace) !== -1);
                 if (foundIcons.length) {
                     const parsedFilePath = path__namespace.relative(__dirname, `.${filePath}`).replace(/\\/g, '/');
-                    utils_packageConfig.logMessage(logger, [
+                    utils_messages.logMessage(logger, [
                         `Please pay attention! Found deprecated icons in file: `,
                         parsedFilePath,
                         foundIcons.map(({ replace, replaceWith }) => `\t${replace} -> \t${replaceWith}`).join('\n')
@@ -84,7 +85,7 @@ function deprecatedIcons(options) {
         targetDir.visit((filePath, entry) => {
             if (filePath.endsWith(stylesExt) && !entry?.content.toString()?.includes(iconsFontImportRule)) {
                 const parsedFilePath = path__namespace.relative(__dirname, `.${filePath}`).replace(/\\/g, '/');
-                utils_packageConfig.logMessage(logger, [
+                utils_messages.logMessage(logger, [
                     parsedFilePath,
                     `Provide \`${iconsFontImportRule}\` to support icon styles from new scope`
                 ]);

package/schematics/migrations/new-icons-pack/index.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var path = require('path');
-var utils_packageConfig = require('../../package-config-D0ROjo4J.js');
+var utils_messages = require('../../utils/messages.js');
+var utils_packageConfig = require('../../utils/package-config.js');
 var migrations_newIconsPack_data = require('./data.js');
 require('@angular-devkit/schematics');
 require('@schematics/angular/utility');
@@ -50,7 +51,7 @@ function newIconsPack(options) {
                 const foundIcons = data.filter(({ replace }) => newContent.indexOf(replace) !== -1);
                 if (foundIcons.length) {
                     const parsedFilePath = path__namespace.relative(__dirname, `.${filePath}`).replace(/\\/g, '/');
-                    utils_packageConfig.logMessage(logger, [
+                    utils_messages.logMessage(logger, [
                         `Please pay attention! Found deprecated icons in file: `,
                         parsedFilePath,
                         foundIcons.map(({ replace, replaceWith }) => `\t${replace} -> \t${replaceWith}`).join('\n')

package/schematics/ng-add/index.js

@@ -4,7 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var schematics = require('@angular-devkit/schematics');
 var utility = require('@schematics/angular/utility');
-var utils_packageConfig = require('../package-config-D0ROjo4J.js');
+var utils_packageConfig = require('../utils/package-config.js');
+require('../utils/messages.js');
 
 function noProject(project) {
     return `Unable to find project '${project}' in the workspace`;
@@ -41,8 +42,8 @@ function ngAdd(options) {
         }
         // Installing dependencies
         utils_packageConfig.addPackageToPackageJson(tree, '@angular/cdk', "^18.2.6");
-        utils_packageConfig.addPackageToPackageJson(tree, '@koobiq/cdk', "^18.7.0");
-        utils_packageConfig.addPackageToPackageJson(tree, '@koobiq/angular-luxon-adapter', "^18.7.0");
+        utils_packageConfig.addPackageToPackageJson(tree, '@koobiq/cdk', "^18.7.1");
+        utils_packageConfig.addPackageToPackageJson(tree, '@koobiq/angular-luxon-adapter', "^18.7.1");
         utils_packageConfig.addPackageToPackageJson(tree, '@koobiq/date-formatter', "^3.1.3");
         utils_packageConfig.addPackageToPackageJson(tree, '@koobiq/date-adapter', "^3.1.3");
         utils_packageConfig.addPackageToPackageJson(tree, '@koobiq/icons', "^9.1.0");

package/schematics/utils/messages.js

@@ -0,0 +1,13 @@
+'use strict';
+
+function noProject(project) {
+    return `Unable to find project '${project}' in the workspace`;
+}
+const logMessage = (logger, content) => {
+    logger.warn('-------------------------');
+    logger.warn(content.join('\n'));
+    logger.warn('-------------------------');
+};
+
+exports.logMessage = logMessage;
+exports.noProject = noProject;

package/schematics/utils/package-config.js

@@ -1,11 +1,62 @@
 'use strict';
 
-require('@angular-devkit/schematics');
-require('@schematics/angular/utility');
-var utils_packageConfig = require('../package-config-D0ROjo4J.js');
+var schematics = require('@angular-devkit/schematics');
+var utility = require('@schematics/angular/utility');
+var utils_messages = require('./messages.js');
 
+/**
+ * Sorts the keys of the given object.
+ * @returns A new object instance with sorted keys
+ */
+function sortObjectByKeys(obj) {
+    return Object.keys(obj)
+        .sort()
+        .reduce((result, key) => (result[key] = obj[key]) && result, {});
+}
+/**
+ * Adds a package to the package.json in the given tree
+ */
+function addPackageToPackageJson(tree, pkg, version, devDependency = false) {
+    if (tree.exists('package.json')) {
+        const sourceText = tree.read('package.json').toString('utf-8');
+        const json = JSON.parse(sourceText);
+        const dependenciesType = devDependency ? 'devDependencies' : 'dependencies';
+        const dependencies = json[dependenciesType] || {};
+        if (!dependencies[pkg]) {
+            dependencies[pkg] = version;
+            json[dependenciesType] = sortObjectByKeys(dependencies);
+        }
+        tree.overwrite('package.json', JSON.stringify(json, null, 2));
+    }
+    return tree;
+}
+/**
+ * Gets the version of the specified package by looking at the package.json in the given tree
+ */
+function getPackageVersionFromPackageJson(tree, name, includeDevDependencies = false) {
+    if (!tree.exists('package.json')) {
+        return null;
+    }
+    const packageJson = JSON.parse(tree.read('package.json').toString('utf8'));
+    if (packageJson.dependencies && packageJson.dependencies[name]) {
+        return packageJson.dependencies[name];
+    }
+    if (includeDevDependencies && packageJson.devDependencies && packageJson.devDependencies[name]) {
+        return packageJson.devDependencies[name];
+    }
+    return null;
+}
+async function setupOptions(project, tree) {
+    if (project) {
+        const workspace = await utility.readWorkspace(tree);
+        const projectWorkspace = workspace.projects.get(project);
+        if (!projectWorkspace) {
+            throw new schematics.SchematicsException(utils_messages.noProject(project));
+        }
+        return projectWorkspace;
+    }
+}
 
-
-exports.addPackageToPackageJson = utils_packageConfig.addPackageToPackageJson;
-exports.getPackageVersionFromPackageJson = utils_packageConfig.getPackageVersionFromPackageJson;
-exports.setupOptions = utils_packageConfig.setupOptions;
+exports.addPackageToPackageJson = addPackageToPackageJson;
+exports.getPackageVersionFromPackageJson = getPackageVersionFromPackageJson;
+exports.setupOptions = setupOptions;