@koobiq/components 18.6.0 → 18.7.1

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

@@ -0,0 +1,97 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var path = require('path');
+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');
+
+function _interopNamespaceDefault(e) {
+    var n = Object.create(null);
+    if (e) {
+        Object.keys(e).forEach(function (k) {
+            if (k !== 'default') {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        });
+    }
+    n.default = e;
+    return Object.freeze(n);
+}
+
+var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
+
+const iconsFontImportRule = "@use '@koobiq/icons/fonts/kbq-icons';";
+function deprecatedIcons(options) {
+    let targetDir;
+    return async (tree, context) => {
+        const { project, fix, stylesExt } = options;
+        try {
+            const projectDefinition = await utils_packageConfig.setupOptions(project, tree);
+            targetDir = projectDefinition ? tree.getDir(projectDefinition.root) : tree;
+        }
+        catch (e) {
+            targetDir = tree;
+        }
+        const { logger } = context;
+        const handleDeprecatedIcons = (newContent, filePath) => {
+            if (fix) {
+                migrations_deprecatedIcons_data.iconsMapping.forEach(({ replace, replaceWith }) => {
+                    newContent = newContent.replace(new RegExp(`kbq-${replace}`, 'g'), `kbq-${replaceWith}`);
+                });
+            }
+            else {
+                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_messages.logMessage(logger, [
+                        `Please pay attention! Found deprecated icons in file: `,
+                        parsedFilePath,
+                        foundIcons.map(({ replace, replaceWith }) => `\t${replace} -> \t${replaceWith}`).join('\n')
+                    ]);
+                }
+            }
+            return newContent;
+        };
+        // Update styles, templates & components
+        targetDir.visit((filePath, entry) => {
+            let initialContent;
+            // if project property not provided, skip files in node_modules & dist
+            if (filePath.includes('node_modules') || filePath.includes('dist')) {
+                return;
+            }
+            if (filePath.endsWith('.html') || filePath.endsWith('.ts') || filePath.endsWith(stylesExt)) {
+                initialContent = entry?.content.toString();
+                let newContent = initialContent;
+                if (newContent) {
+                    migrations_deprecatedIcons_data.iconClassReplacements.forEach(({ replace, replaceWith }) => {
+                        newContent = newContent.replace(new RegExp(replace, 'g'), replaceWith);
+                    });
+                    newContent = handleDeprecatedIcons(newContent, filePath);
+                    if (initialContent !== newContent) {
+                        tree.overwrite(filePath, newContent || '');
+                    }
+                }
+            }
+        });
+        // check if icon styles from new scope should be included in styles file
+        targetDir.visit((filePath, entry) => {
+            if (filePath.endsWith(stylesExt) && !entry?.content.toString()?.includes(iconsFontImportRule)) {
+                const parsedFilePath = path__namespace.relative(__dirname, `.${filePath}`).replace(/\\/g, '/');
+                utils_messages.logMessage(logger, [
+                    parsedFilePath,
+                    `Provide \`${iconsFontImportRule}\` to support icon styles from new scope`
+                ]);
+            }
+        });
+    };
+}
+
+exports.default = deprecatedIcons;

package/schematics/{new-icons-pack → migrations/new-icons-pack}/index.js

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var chalk = require('chalk');
 var path = require('path');
-var utils_packageConfig = require('../utils/package-config.js');
-var newIconsPack_data = require('./data.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');
 
@@ -28,12 +28,9 @@ function _interopNamespaceDefault(e) {
 
 var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 
-const { italic, blue, bold } = chalk;
-const data = newIconsPack_data.newIconsPackData;
+const data = migrations_newIconsPack_data.newIconsPackData;
 function newIconsPack(options) {
     let targetDir;
-    const breakingIconsVersionRegExp = /^\^|\~?9\.1\.0/;
-    const pkg = '@koobiq/icons';
     return async (tree, context) => {
         const { project, fix, stylesExt } = options;
         try {
@@ -44,7 +41,7 @@ function newIconsPack(options) {
             targetDir = tree;
         }
         const { logger } = context;
-        const handleDeprecatedIcons = (newContent, path) => {
+        const handleDeprecatedIcons = (newContent, filePath) => {
             if (fix) {
                 data.forEach(({ replace, replaceWith }) => {
                     newContent = newContent.replace(new RegExp(`kbq-${replace}`, 'g'), `kbq-${replaceWith}`);
@@ -53,32 +50,27 @@ function newIconsPack(options) {
             else {
                 const foundIcons = data.filter(({ replace }) => newContent.indexOf(replace) !== -1);
                 if (foundIcons.length) {
-                    showWarning(path, foundIcons, logger);
+                    const parsedFilePath = path__namespace.relative(__dirname, `.${filePath}`).replace(/\\/g, '/');
+                    utils_messages.logMessage(logger, [
+                        `Please pay attention! Found deprecated icons in file: `,
+                        parsedFilePath,
+                        foundIcons.map(({ replace, replaceWith }) => `\t${replace} -> \t${replaceWith}`).join('\n')
+                    ]);
                 }
             }
             return newContent;
         };
-        // Check if breaking version is used indeed
-        if (tree.exists('package.json')) {
-            const sourceText = tree.read('package.json').toString('utf-8');
-            const json = JSON.parse(sourceText);
-            const isIconsBreakingVersionUsed = ['devDependencies', 'dependencies', 'peerDependencies'].some((type) => json[type] && json[type][pkg] && breakingIconsVersionRegExp.test(json[type][pkg]));
-            if (!isIconsBreakingVersionUsed) {
-                logger.warn('Breaking version of icons is not used. Everything is OK.');
-                return;
-            }
-        }
         // Update templates & components
         targetDir.visit((path, entry) => {
-            // if project property not provided, provide node_modules to be changed
-            if (path.includes('node_modules')) {
+            // if project property not provided, skip files in node_modules & dist
+            if (path.includes('node_modules') || path.includes('dist')) {
                 return;
             }
             if (path.endsWith('.html') || path.endsWith('.ts') || path.endsWith('.md')) {
                 const initialContent = entry?.content.toString();
                 let newContent = initialContent;
                 if (newContent) {
-                    newIconsPack_data.iconReplacements.forEach(({ replace, replaceWith }) => {
+                    migrations_newIconsPack_data.iconReplacements.forEach(({ replace, replaceWith }) => {
                         newContent = newContent.replace(new RegExp(replace, 'g'), replaceWith);
                     });
                     newContent = handleDeprecatedIcons(newContent, path);
@@ -109,12 +101,5 @@ function newIconsPack(options) {
         });
     };
 }
-function showWarning(filePath, foundIcons, logger) {
-    logger.warn('-------------------------');
-    logger.warn(`Please pay attention! Found deprecated icons in file: `);
-    logger.info(`${bold(italic(blue(path__namespace.resolve(`.${filePath}`))))}`);
-    logger.warn(foundIcons.map(({ replace, replaceWith }) => `\t${replace} -> \t${replaceWith}`).join('\n'));
-    logger.warn('-------------------------');
-}
 
 exports.default = newIconsPack;

package/schematics/migrations/new-icons-pack/schema.json

@@ -0,0 +1,25 @@
+{
+    "$schema": "http://json-schema.org/schema",
+    "$id": "koobiq-components-new-icons-pack",
+    "title": "koobiq-components new-icons-pack schematic",
+    "type": "object",
+    "properties": {
+        "project": {
+            "type": "string",
+            "description": "Name of the project",
+            "$default": {
+                "$source": "projectName"
+            }
+        },
+        "fix": {
+            "type": "boolean",
+            "description": "Whether overwrite icons prefixes or simply inform in console",
+            "default": false
+        },
+        "stylesExt": {
+            "type": "string",
+            "description": "Use this option to specify styles extension preferred in your project",
+            "default": "scss"
+        }
+    }
+}

package/schematics/ng-add/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var schematics = require('@angular-devkit/schematics');
 var utility = require('@schematics/angular/utility');
 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.6.0");
-        utils_packageConfig.addPackageToPackageJson(tree, '@koobiq/angular-luxon-adapter', "^18.6.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

@@ -2,10 +2,7 @@
 
 var schematics = require('@angular-devkit/schematics');
 var utility = require('@schematics/angular/utility');
-
-function noProject(project) {
-    return `Unable to find project '${project}' in the workspace`;
-}
+var utils_messages = require('./messages.js');
 
 /**
  * Sorts the keys of the given object.
@@ -54,7 +51,7 @@ async function setupOptions(project, tree) {
         const workspace = await utility.readWorkspace(tree);
         const projectWorkspace = workspace.projects.get(project);
         if (!projectWorkspace) {
-            throw new schematics.SchematicsException(noProject(project));
+            throw new schematics.SchematicsException(utils_messages.noProject(project));
         }
         return projectWorkspace;
     }