@public-ui/kolibri-cli 1.7.0-rc.2 → 1.7.0-rc.3

package/dist/index.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
-const migrate_1 = __importDefault(require("./migrate"));
 const gradient_string_1 = __importDefault(require("gradient-string"));
+const migrate_1 = __importDefault(require("./migrate"));
 const reuse_1 = require("./migrate/shares/reuse");
 const versionOfPublicUiKoliBriCli = (0, reuse_1.getVersionOfPublicUiKoliBriCli)();
 const banner = gradient_string_1.default.atlas.multiline(`

package/dist/migrate/index.js

@@ -20,7 +20,7 @@ function default_1(program) {
     program
         .command('migrate')
         .description('This command migrates KoliBri code to the current version.')
-        .argument('<string>', 'Source code folder to migrate')
+        .argument('[string]', 'Source code folder to migrate', 'src')
         .addOption(new commander_1.Option('--ignore-uncommitted-changes', 'Allows execution with uncommitted changes').default(false))
         .addOption(new commander_1.Option('--remove-mode <mode>', 'Prefix property name or delete property').choices(types_1.REMOVE_MODE).default('prefix'))
         .addOption(new commander_1.Option('--test-tasks', 'Run additional test tasks').default(false).hideHelp())
@@ -31,7 +31,7 @@ function default_1(program) {
                 return;
             }
             if (!options.ignoreUncommittedChanges && stdout) {
-                throw new Error('There are uncommitted changes');
+                throw (0, reuse_1.logAndCreateError)('There are uncommitted changes');
             }
             (0, reuse_1.setRemoveMode)(options.removeMode);
             const versionOfPublicUiComponents = (0, reuse_1.getVersionOfPublicUiComponents)();
@@ -63,7 +63,7 @@ Source folder to migrate: ${baseDir}
                 runner.run();
                 if (version !== runner.getPendingMinVersion()) {
                     version = runner.getPendingMinVersion();
-                    let packageJson = (0, reuse_1.readPackageString)(path_1.default.resolve(process.cwd()));
+                    let packageJson = (0, reuse_1.getContentOfProjectPkgJson)();
                     packageJson = packageJson.replace(/"(@public-ui\/[^"]+)":\s*".*"/g, `"$1": "${version}"`);
                     fs_1.default.writeFileSync(path_1.default.resolve(process.cwd(), 'package.json'), packageJson);
                     runner.setProjectVersion(version);

package/dist/migrate/runner/abstract-task.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractTask = void 0;
 const semver_1 = __importDefault(require("semver"));
 const types_1 = require("../../types");
+const reuse_1 = require("../shares/reuse");
 class AbstractTask {
     constructor(identifier, title, extensions, versionRange, dependentTasks = [], options = {}) {
         this.identifier = identifier;
@@ -17,7 +18,7 @@ class AbstractTask {
         this.description = options.description;
         this.extensions = this.extensions.filter((ext) => types_1.FILE_EXTENSIONS.includes(ext));
         if (!semver_1.default.validRange(this.versionRange)) {
-            throw new Error(`[${this.identifier}] Invalid semver range version: ${this.versionRange}`);
+            throw (0, reuse_1.logAndCreateError)(`[${this.identifier}] Invalid semver range version: ${this.versionRange}`);
         }
     }
     getDependentTasks() {

package/dist/migrate/runner/task-runner.js

@@ -4,9 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskRunner = void 0;
+const chalk_1 = __importDefault(require("chalk"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const semver_1 = __importDefault(require("semver"));
+const reuse_1 = require("../shares/reuse");
 class TaskRunner {
     constructor(baseDir, cliVersion, projectVersion, config) {
         this.tasks = new Map();
@@ -25,19 +27,19 @@ class TaskRunner {
     }
     setBaseDir(baseDir) {
         if (!fs_1.default.existsSync(path_1.default.resolve(process.cwd(), baseDir))) {
-            throw new Error(`Base directory "${baseDir}" does not exist`);
+            throw (0, reuse_1.logAndCreateError)(`Base directory "${baseDir}" does not exist`);
         }
         this.baseDir = baseDir;
     }
     setCliVersion(version) {
         if (semver_1.default.valid(version) === null) {
-            throw new Error(`Invalid CLI version: ${version}`);
+            throw (0, reuse_1.logAndCreateError)(`Invalid CLI version: ${version}`);
         }
         this.cliVersion = version;
     }
     setProjectVersion(version) {
         if (semver_1.default.valid(version) === null) {
-            throw new Error(`Invalid project version: ${version}`);
+            throw (0, reuse_1.logAndCreateError)(`Invalid project version: ${version}`);
         }
         if (this.projectVersion !== version) {
             this.projectVersion = version;
@@ -118,7 +120,8 @@ class TaskRunner {
                     break;
             }
             if (outline) {
-                console.log(`- ${task.getTitle()}: ${task.getStatus()}`);
+                const status = task.getStatus();
+                console.log(`- ${task.getTitle()}:`, status === 'done' ? chalk_1.default.green(status) : chalk_1.default.yellow(status));
             }
         });
         return {

package/dist/migrate/runner/tasks/common/GenericRenamePropertyTask.js

@@ -15,13 +15,13 @@ class GenericRenamePropertyTask extends abstract_task_1.AbstractTask {
     constructor(identifier, description, tag, oldProperty, newProperty, versionRange, dependentTasks = [], options = {}) {
         super(identifier, description, EXTENSIONS, versionRange, dependentTasks, options);
         if (!reuse_1.isTagKebabCaseRegExp.test(tag)) {
-            throw new Error(`Tag "${tag}" is not in kebab case.`);
+            (0, reuse_1.logAndCreateError)(`Tag "${tag}" is not in kebab case.`);
         }
         if (!reuse_1.isPropertyKebabCaseRegExp.test(oldProperty)) {
-            throw new Error(`Old property "${oldProperty}" is not in kebab case.`);
+            (0, reuse_1.logAndCreateError)(`Old property "${oldProperty}" is not in kebab case.`);
         }
         if (!reuse_1.isPropertyKebabCaseRegExp.test(newProperty)) {
-            throw new Error(`New property "${newProperty}" is not in kebab case.`);
+            throw (0, reuse_1.logAndCreateError)(`New property "${newProperty}" is not in kebab case.`);
         }
         this.newProperty = newProperty;
         this.oldPropertyInCamelCase = (0, reuse_1.kebabToCapitalCase)(oldProperty);

package/dist/migrate/runner/tasks/common/LabelExpertSlot.js

@@ -0,0 +1,46 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LabelExpertSlot = void 0;
+const fs_1 = __importDefault(require("fs"));
+const types_1 = require("../../../../types");
+const reuse_1 = require("../../../shares/reuse");
+const abstract_task_1 = require("../../abstract-task");
+class LabelExpertSlot extends abstract_task_1.AbstractTask {
+    static getInstance(identifier, title, extensions, versionRange, dependentTasks = [], options = {}) {
+        if (!this.instances.has(identifier)) {
+            this.instances.set(identifier, new LabelExpertSlot(identifier, title, extensions, versionRange, dependentTasks, options));
+        }
+        return this.instances.get(identifier);
+    }
+    run(baseDir) {
+        this.transpileComponentFileDelete(baseDir);
+        this.transpileCustomElementFileDelete(baseDir);
+    }
+    transpileComponentFileDelete(baseDir) {
+        (0, reuse_1.filterFilesByExt)(baseDir, types_1.COMPONENT_FILE_EXTENSIONS).forEach((file) => {
+            const content = fs_1.default.readFileSync(file, 'utf8');
+            const newContent = content;
+            console.log(content.match(/<\/KolSelect/));
+            // Replacements
+            if (content !== newContent) {
+                reuse_1.MODIFIED_FILES.add(file);
+                fs_1.default.writeFileSync(file, newContent);
+            }
+        });
+    }
+    transpileCustomElementFileDelete(baseDir) {
+        (0, reuse_1.filterFilesByExt)(baseDir, types_1.COMPONENT_FILE_EXTENSIONS).forEach((file) => {
+            const content = fs_1.default.readFileSync(file, 'utf8');
+            const newContent = content;
+            // Replacements
+            if (content !== newContent) {
+                reuse_1.MODIFIED_FILES.add(file);
+                fs_1.default.writeFileSync(file, newContent);
+            }
+        });
+    }
+}
+exports.LabelExpertSlot = LabelExpertSlot;

package/dist/migrate/runner/tasks/common/RemovePropertyNameTask.js

@@ -13,10 +13,10 @@ class RemovePropertyNameTask extends GenericRenamePropertyTask_1.GenericRenamePr
     constructor(identifier, tag, property, versionRange, dependentTasks, options) {
         super(identifier, `Remove property "${property}" of "${tag}" component`, tag, property, `data-removed-${property}`, versionRange, dependentTasks, options);
         if (!reuse_1.isTagKebabCaseRegExp.test(tag)) {
-            throw new Error(`Tag "${tag}" is not in kebab case.`);
+            throw (0, reuse_1.logAndCreateError)(`Tag "${tag}" is not in kebab case.`);
         }
         if (!reuse_1.isPropertyKebabCaseRegExp.test(property)) {
-            throw new Error(`Property "${property}" is not in kebab case.`);
+            throw (0, reuse_1.logAndCreateError)(`Property "${property}" is not in kebab case.`);
         }
         this.propertyInCamelCase = (0, reuse_1.kebabToCapitalCase)(property);
         this.componentRegExpBoolean = new RegExp(`(<${(0, reuse_1.kebabToCapitalCase)(tag)}[^>]+)${this.propertyInCamelCase}([ >])`, 'g');

package/dist/migrate/runner/tasks/test/index.js

@@ -1,20 +1,16 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.testTasks = void 0;
-const path_1 = __importDefault(require("path"));
 const reuse_1 = require("../../../shares/reuse");
 const test_version_1_3_1 = require("./test-version-1.3");
+const test_version_current_1 = require("./test-version-current");
 const test_version_next_2_1 = require("./test-version-next-2");
 const test_version_next_3_1 = require("./test-version-next-3");
 const test_version_zero_1 = require("./test-version-zero");
-const test_version_current_1 = require("./test-version-current");
 exports.testTasks = [];
 exports.testTasks.push(test_version_zero_1.TestVersionZero.getInstance());
 exports.testTasks.push(test_version_next_2_1.TestVersionNext2.getInstance());
 exports.testTasks.push(test_version_next_3_1.TestVersionNext3.getInstance());
 exports.testTasks.push(test_version_1_3_1.TestVersion13.getInstance());
-const versionOfPublicUiComponents = (0, reuse_1.readPackageJson)(path_1.default.resolve(process.cwd(), 'node_modules/@public-ui/components')).version;
+const versionOfPublicUiComponents = (0, reuse_1.getVersionOfPublicUiComponents)();
 exports.testTasks.push(test_version_current_1.TestVersionCurrent.getInstance(versionOfPublicUiComponents));

package/dist/migrate/runner/tasks/v1/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.v1Tasks = void 0;
+const types_1 = require("../../../../types");
+const LabelExpertSlot_1 = require("../common/LabelExpertSlot");
 const abbr_1 = require("./abbr");
 const accordion_1 = require("./accordion");
 const badge_1 = require("./badge");
@@ -103,3 +105,4 @@ exports.v1Tasks.push(tabs_1.TabsRenamePropertyAriaLabelToLabel);
 exports.v1Tasks.push(tabs_1.TabsRenamePropertyTabAlignToAlign);
 exports.v1Tasks.push(toast_1.ToastRenamePropertyHeadingToLabel);
 exports.v1Tasks.push(version_1.VersionRenamePropertyVersionToLabel);
+exports.v1Tasks.push(LabelExpertSlot_1.LabelExpertSlot.getInstance('label-expert-slot', 'Label Expert Slot', types_1.COMPONENT_FILE_EXTENSIONS, '^1'));

package/dist/migrate/shares/reuse.js

@@ -3,9 +3,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVersionOfPublicUiKoliBriCli = exports.getVersionOfPublicUiComponents = exports.getRemoveMode = exports.setRemoveMode = exports.MODIFIED_FILES = exports.kebabToCapitalCase = exports.isPropertyKebabCaseRegExp = exports.isTagKebabCaseRegExp = exports.getPackageManagerInstallCommand = exports.readPackageJson = exports.readPackageString = exports.filterFilesByExt = void 0;
+exports.getVersionOfPublicUiKoliBriCli = exports.getVersionOfPublicUiComponents = exports.getContentOfProjectPkgJson = exports.getRemoveMode = exports.setRemoveMode = exports.MODIFIED_FILES = exports.kebabToCapitalCase = exports.isPropertyKebabCaseRegExp = exports.isTagKebabCaseRegExp = exports.getPackageManagerInstallCommand = exports.filterFilesByExt = exports.logAndCreateError = void 0;
+const chalk_1 = __importDefault(require("chalk"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+/**
+ * This function is used to exit the process with an error message.
+ * @param {string} msg The error message
+ * @param {string} hint The hint message
+ * @returns {Error} The error object
+ */
+function logAndCreateError(msg, hint) {
+    const hintText = hint
+        ? chalk_1.default.yellow(`
+ℹ️ `, chalk_1.default.underline.bold(`Hinweis:`), hint, `
+`)
+        : '';
+    console.log(chalk_1.default.red(chalk_1.default.underline.bold(`
+Error:`), `${msg}
+`), hintText, `
+  👉 You can report this error to`, chalk_1.default.blue(`https://github.com/public-ui/kolibri/issues/new?title=CLI:+`), `
+`);
+    // @todo process.exit(1); // makes `hint` undefined - ?!
+    return new Error();
+}
+exports.logAndCreateError = logAndCreateError;
 /**
  * Recursively searches for files with the specified extension in the specified directory.
  * @param {string} dir The directory to search in
@@ -36,11 +58,10 @@ exports.filterFilesByExt = filterFilesByExt;
 function readPackageString(offsetPath) {
     offsetPath = path_1.default.resolve(offsetPath, 'package.json');
     if (!fs_1.default.existsSync(offsetPath)) {
-        throw new Error(`${offsetPath} not found`);
+        throw logAndCreateError(`The following "package.json" does not exists: ${offsetPath}`);
     }
     return fs_1.default.readFileSync(offsetPath, 'utf8');
 }
-exports.readPackageString = readPackageString;
 /**
  * This function is used to get the version of the package.json.
  * @param {string} offsetPath The offset path to the package.json
@@ -53,11 +74,10 @@ function readPackageJson(offsetPath) {
         json = JSON.parse(content);
     }
     catch (err) {
-        throw new Error(`Error reading package.json: ${err.message}`);
+        throw logAndCreateError(`The following "package.json" content could not parse: ${content}`);
     }
     return json;
 }
-exports.readPackageJson = readPackageJson;
 /**
  * This function is used to get the package manager install command.
  * @param {string} baseDir The base directory to start searching for the package manager
@@ -72,7 +92,7 @@ function getPackageManagerInstallCommand(baseDir = process.cwd()) {
         return 'npm i';
     baseDir = path_1.default.resolve(baseDir, '..');
     if (baseDir === '/') {
-        throw new Error('Package manager could not detected.');
+        throw logAndCreateError('Package manager could not detected.');
     }
     return getPackageManagerInstallCommand(baseDir);
 }
@@ -109,7 +129,30 @@ function getRemoveMode() {
     return REMOVE_MODE;
 }
 exports.getRemoveMode = getRemoveMode;
-const getVersionOfPublicUiComponents = () => readPackageJson(path_1.default.resolve(process.cwd(), 'node_modules/@public-ui/components')).version;
+const getContentOfProjectPkgJson = () => {
+    try {
+        return readPackageString(path_1.default.resolve(process.cwd()));
+    }
+    catch (err) {
+        throw logAndCreateError('Could not read content of project "package.json"!');
+    }
+};
+exports.getContentOfProjectPkgJson = getContentOfProjectPkgJson;
+const getVersionOfPublicUiComponents = () => {
+    try {
+        return readPackageJson(path_1.default.resolve(process.cwd(), 'node_modsules/@public-ui/components')).version;
+    }
+    catch (err) {
+        throw logAndCreateError('Could not get version of installed "@public-ui/components" package!', 'Check that you are in the root directory of your project and that the package "@public-ui/components" is installed.');
+    }
+};
 exports.getVersionOfPublicUiComponents = getVersionOfPublicUiComponents;
-const getVersionOfPublicUiKoliBriCli = () => readPackageJson(path_1.default.resolve(__dirname, '..', '..', '..')).version;
+const getVersionOfPublicUiKoliBriCli = () => {
+    try {
+        return readPackageJson(path_1.default.resolve(__dirname, '..', '..', '..')).version;
+    }
+    catch (err) {
+        throw logAndCreateError('Could not get version of global installed "@public-ui/kolibri-cli" package!', 'Install the package with: npm i -g @public-ui/kolibri-cli');
+    }
+};
 exports.getVersionOfPublicUiKoliBriCli = getVersionOfPublicUiKoliBriCli;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@public-ui/kolibri-cli",
-	"version": "1.7.0-rc.2",
+	"version": "1.7.0-rc.3",
 	"license": "EUPL-1.2",
 	"homepage": "https://public-ui.github.io",
 	"repository": "https://github.com/public-ui/kolibri",
@@ -22,14 +22,15 @@
 		"format": "prettier -c src",
 		"lint": "eslint src && tsc --noEmit",
 		"prepack": "tsc",
-		"start": "ts-node src/index.ts migrate --test-tasks test",
+		"start": "ts-node src/index.ts migrate --ignore-uncommitted-changes --test-tasks test",
 		"restart": "pnpm reset && pnpm start",
 		"unused": "knip",
 		"update": "ncu -t minor -u && ncu",
-		"watch": "nodemon --ignore package.json src/index.ts migrate --test-tasks test"
+		"watch": "nodemon --ignore package.json src/index.ts migrate --ignore-uncommitted-changes --test-tasks test"
 	},
+	"type": "commonjs",
 	"dependencies": {
-		"chalk": "5.3.0",
+		"chalk": "^4",
 		"commander": "11.0.0",
 		"gradient-string": "2.0.2",
 		"loglevel": "1.8.1",