@public-ui/kolibri-cli 3.0.7-d0e38f2b24188b03316351f07d939c4524a2fd81.0 → 3.0.7-rc.5

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

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.v4Tasks = void 0;
 const id_1 = require("./id");
 const msg_1 = require("./msg");
+const toast_1 = require("./toast");
+const toaster_1 = require("./toaster");
 exports.v4Tasks = [];
 exports.v4Tasks.push(...id_1.RemoveIdPropTasks);
 exports.v4Tasks.push(...msg_1.RemoveMsgPropsTasks);
+exports.v4Tasks.push(toast_1.RemoveToastVariantTask.getInstance('^4'));
+exports.v4Tasks.push(toaster_1.RemoveToasterGetInstanceOptionsTask.getInstance('^4'));

package/dist/migrate/runner/tasks/v4/toast.js

@@ -0,0 +1,56 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RemoveToastVariantTask = void 0;
+const fs_1 = __importDefault(require("fs"));
+const reuse_1 = require("../../../shares/reuse");
+const abstract_task_1 = require("../../abstract-task");
+// Toast migration should cover JavaScript/TypeScript files where toast services are used
+const TOAST_FILE_EXTENSIONS = ['js', 'jsx', 'ts', 'tsx', 'vue'];
+class RemoveToastVariantTask extends abstract_task_1.AbstractTask {
+    toastEnqueueVariantRegExp;
+    toastObjectVariantRegExp;
+    constructor(identifier, versionRange, dependentTasks, options) {
+        super(identifier, 'Remove "variant" property from Toast objects in enqueue() calls', TOAST_FILE_EXTENSIONS, versionRange, dependentTasks, options);
+        // Match variant property in enqueue() calls - multiline support
+        this.toastEnqueueVariantRegExp = /(\benqueue\s*\(\s*\{[\s\S]*?)(\s*,?\s*variant\s*:\s*['"]\w+['"][\s\S]*?(?=\s*[,}]))([,\s]*[\s\S]*?\})/g;
+        // Match variant property in toast objects - multiline support
+        this.toastObjectVariantRegExp = /(\{\s*[\s\S]*?)(\s*,?\s*variant\s*:\s*['"]\w+['"][\s\S]*?(?=\s*[,}]))([,\s]*[\s\S]*?\})/g;
+    }
+    static getInstance(versionRange, dependentTasks, options) {
+        const identifier = `remove-toast-variant-${versionRange}`;
+        return new RemoveToastVariantTask(identifier, versionRange, dependentTasks, options);
+    }
+    run(baseDir) {
+        this.transpileFiles(baseDir);
+    }
+    transpileFiles(baseDir) {
+        (0, reuse_1.filterFilesByExt)(baseDir, TOAST_FILE_EXTENSIONS).forEach((file) => {
+            const content = fs_1.default.readFileSync(file, 'utf8');
+            let newContent = content;
+            let modified = false;
+            // Simple RegEx to match variant lines
+            const variantLineRegExp = /^(\s*)variant\s*:\s*['"]\w+['"],?\s*$/gm;
+            // Check if the file likely contains toast-related code
+            if (content.includes('enqueue') || (content.includes('type:') && content.includes('variant:'))) {
+                newContent = newContent.replace(variantLineRegExp, () => {
+                    modified = true;
+                    return ''; // Remove the entire line
+                });
+                // Clean up potential comma issues after removing lines
+                newContent = newContent.replace(/,(\s*\n\s*\})/g, '$1'); // Comma before closing brace
+                newContent = newContent.replace(/\{(\s*\n\s*,)/g, '{$1'.replace(',', '')); // Comma after opening brace
+                newContent = newContent.replace(/,(\s*\n\s*,)/g, '$1'); // Double commas
+                // Remove excessive empty lines
+                newContent = newContent.replace(/\n\s*\n\s*\n/g, '\n\n');
+            }
+            if (modified && (0, reuse_1.getRemoveMode)()) {
+                reuse_1.MODIFIED_FILES.add(file);
+                fs_1.default.writeFileSync(file, newContent);
+            }
+        });
+    }
+}
+exports.RemoveToastVariantTask = RemoveToastVariantTask;

package/dist/migrate/runner/tasks/v4/toaster.js

@@ -0,0 +1,68 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RemoveToasterGetInstanceOptionsTask = void 0;
+const fs_1 = __importDefault(require("fs"));
+const reuse_1 = require("../../../shares/reuse");
+const abstract_task_1 = require("../../abstract-task");
+// ToasterService migration should cover JavaScript/TypeScript files where the service is used
+const TOASTER_FILE_EXTENSIONS = ['js', 'jsx', 'ts', 'tsx', 'vue'];
+class RemoveToasterGetInstanceOptionsTask extends abstract_task_1.AbstractTask {
+    getInstanceOptionsRegExp;
+    constructor(identifier, versionRange, dependentTasks, options) {
+        super(identifier, 'Remove "defaultVariant" option from ToasterService.getInstance() calls', TOASTER_FILE_EXTENSIONS, versionRange, dependentTasks, options);
+        // Match ToasterService.getInstance(document, { defaultVariant: '...' })
+        // This regex captures the service call and removes the options parameter if it only contains defaultVariant
+        this.getInstanceOptionsRegExp = /(\bToasterService\.getInstance\s*\(\s*[^,)]+)(\s*,\s*\{\s*defaultVariant\s*:\s*['"]\w+['"]\s*\})(\s*\))/g;
+    }
+    static getInstance(versionRange, dependentTasks, options) {
+        const identifier = `remove-toaster-get-instance-options-${versionRange}`;
+        return new RemoveToasterGetInstanceOptionsTask(identifier, versionRange, dependentTasks, options);
+    }
+    run(baseDir) {
+        this.transpileFiles(baseDir);
+    }
+    transpileFiles(baseDir) {
+        (0, reuse_1.filterFilesByExt)(baseDir, TOASTER_FILE_EXTENSIONS).forEach((file) => {
+            const content = fs_1.default.readFileSync(file, 'utf8');
+            let newContent = content;
+            let modified = false;
+            // Remove defaultVariant options from ToasterService.getInstance() calls
+            newContent = newContent.replace(this.getInstanceOptionsRegExp, (match, before, optionsParam, after) => {
+                modified = true;
+                // Simply remove the options parameter entirely
+                return before + after;
+            });
+            // Also handle more complex cases where there might be other options mixed in
+            // Match any options object that contains defaultVariant and remove just that property
+            const complexOptionsRegExp = /(\bToasterService\.getInstance\s*\(\s*[^,)]+\s*,\s*\{[^}]*?)(?:,\s*)?defaultVariant\s*:\s*['"]\w+['"](?:,\s*)?([^}]*\})/g;
+            newContent = newContent.replace(complexOptionsRegExp, (match, before, after) => {
+                // Only modify if we haven't already handled this with the simpler regex
+                if (!this.getInstanceOptionsRegExp.test(match)) {
+                    modified = true;
+                    // Clean up potential double commas
+                    const cleanBefore = before.replace(/,\s*$/, '');
+                    const cleanAfter = after.replace(/^\s*,/, '');
+                    // Check if the options object would be empty after removing defaultVariant
+                    if (cleanAfter.trim() === '}' && cleanBefore.trim().endsWith('{')) {
+                        // Remove the entire options parameter
+                        return cleanBefore.replace(/\s*,\s*\{\s*$/, '');
+                    }
+                    // Add comma if needed between remaining properties
+                    if (cleanBefore.trim() !== '{' && cleanAfter.trim() !== '}' && !cleanBefore.endsWith(',') && !cleanAfter.startsWith(',')) {
+                        return cleanBefore + ',' + cleanAfter;
+                    }
+                    return cleanBefore + cleanAfter;
+                }
+                return match;
+            });
+            if (modified && (0, reuse_1.getRemoveMode)()) {
+                reuse_1.MODIFIED_FILES.add(file);
+                fs_1.default.writeFileSync(file, newContent);
+            }
+        });
+    }
+}
+exports.RemoveToasterGetInstanceOptionsTask = RemoveToasterGetInstanceOptionsTask;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@public-ui/kolibri-cli",
-  "version": "3.0.7-d0e38f2b24188b03316351f07d939c4524a2fd81.0",
+  "version": "3.0.7-rc.5",
   "license": "EUPL-1.2",
   "homepage": "https://public-ui.github.io",
   "repository": {
@@ -27,15 +27,15 @@
     "gradient-string": "3.0.0",
     "loglevel": "1.9.2",
     "prettier": "3.6.2",
-    "semver": "7.7.2",
-    "typed-bem": "1.0.0-rc.7"
+    "semver": "7.7.3",
+    "typed-bem": "1.0.2"
   },
   "devDependencies": {
-    "@types/node": "24.5.0",
+    "@types/node": "24.5.2",
     "@typescript-eslint/eslint-plugin": "7.18.0",
     "@typescript-eslint/parser": "7.18.0",
     "cpy-cli": "6.0.0",
-    "cross-env": "10.0.0",
+    "cross-env": "10.1.0",
     "eslint": "8.57.1",
     "eslint-config-prettier": "9.1.2",
     "eslint-plugin-html": "8.1.3",
@@ -43,13 +43,13 @@
     "eslint-plugin-json": "3.1.0",
     "eslint-plugin-jsx-a11y": "6.10.2",
     "eslint-plugin-react": "7.37.5",
-    "knip": "5.63.1",
-    "mocha": "11.7.2",
+    "knip": "5.65.0",
+    "mocha": "11.7.4",
     "nodemon": "3.1.10",
     "rimraf": "6.0.1",
     "ts-node": "10.9.2",
-    "typescript": "5.9.2",
-    "@public-ui/components": "3.0.7-d0e38f2b24188b03316351f07d939c4524a2fd81.0"
+    "typescript": "5.9.3",
+    "@public-ui/components": "3.0.7-rc.5"
   },
   "files": [
     "dist"
@@ -61,11 +61,12 @@
     "lint": "pnpm lint:eslint && pnpm lint:tsc",
     "lint:eslint": "eslint src",
     "lint:tsc": "tsc --noemit",
-    "start": "rimraf test && cpy \"../../samples/react/src/components\" test/src && cpy \"../../samples/react/public/*.html\" test/ && ts-node src/index.ts migrate --ignore-uncommitted-changes --test-tasks test",
+    "pretest": "pnpm build",
     "restart": "pnpm reset && pnpm start",
-    "unused": "knip",
-    "watch": "nodemon --ignore package.json src/index.ts migrate --ignore-uncommitted-changes --test-tasks test",
+    "start": "rimraf test && cpy \"../../samples/react/src/components\" test/src && cpy \"../../samples/react/public/*.html\" test/ && ts-node src/index.ts migrate --ignore-uncommitted-changes --test-tasks test",
     "test": "pnpm test:unit",
-    "test:unit": "cross-env TS_NODE_PROJECT=tsconfig.test.json mocha --require ts-node/register test/**/*.ts --no-experimental-strip-types"
+    "test:unit": "cross-env TS_NODE_PROJECT=tsconfig.test.json mocha --require ts-node/register test/**/*.ts --no-experimental-strip-types",
+    "unused": "knip",
+    "watch": "nodemon --ignore package.json src/index.ts migrate --ignore-uncommitted-changes --test-tasks test"
   }
 }