@navikt/aksel 7.37.0 → 7.39.0

package/dist/codemod/index.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -9,27 +18,36 @@ const commander_1 = require("commander");
 const figlet_1 = __importDefault(require("figlet"));
 const migrations_js_1 = require("./migrations.js");
 const run_codeshift_js_1 = require("./run-codeshift.js");
+const run_version_migration_js_1 = require("./run-version-migration.js");
 const validation_js_1 = require("./validation.js");
 const program = new commander_1.Command();
-function codemodCommand() {
+function codemodCommand(overrideHandler) {
     program.name(`${chalk_1.default.blueBright(`npx @navikt/aksel`)}`);
     program
         .command("codemod")
         .addHelpText("beforeAll", figlet_1.default.textSync("Codemods"))
         .addHelpText("afterAll", chalk_1.default.gray(`\nAvailable migrations:\n${(0, migrations_js_1.getMigrationString)()}`))
         .description("Migrations for Aksel components and more")
-        .argument("<migration>", "Migration name")
+        .argument("<migration>", "Migration name or version (e.g. v8)")
         .option("-e, --ext [extension]", "default: js,ts,jsx,tsx,css,scss,less")
         .option("-g, --glob [glob]", "Globbing pattern, overrides --ext! Run with 'noglob' if using zsh-terminal. ")
         .option("-d, --dry-run", "Dry run, no changes will be made")
         .option("-p, --print", "Print transformed files")
         .option("-f, --force", "Forcibly run migrations without checking git-changes")
         .addHelpText("after", `\nExample:
-  $ npx @navikt/aksel --dry-run v2-css`)
-        .action((str, options) => {
+  $ npx @navikt/aksel codemod --dry-run v2-css
+  $ npx @navikt/aksel codemod v8  # Interactive selection for version`)
+        .action((str, options) => __awaiter(this, void 0, void 0, function* () {
+        /* Check if the argument is a version key for interactive selection */
+        if (/^v\d+$/.test(str)) {
+            (0, run_version_migration_js_1.validateVersion)(str, program);
+            yield (0, run_version_migration_js_1.runVersionMigration)(str, options, program, overrideHandler);
+            return;
+        }
+        /* Otherwise, treat it as a specific migration name */
         (0, validation_js_1.validateMigration)(str, program);
         (0, validation_js_1.validateGit)(options, program);
         (0, run_codeshift_js_1.runCodeshift)(str, options, program);
-    });
+    }));
     program.parse();
 }

package/dist/codemod/migrations.js

@@ -8,6 +8,9 @@ exports.getMigrationPath = getMigrationPath;
 exports.getWarning = getWarning;
 exports.getIgnoredFileExtensions = getIgnoredFileExtensions;
 exports.getMigrationNames = getMigrationNames;
+exports.getVersionKeys = getVersionKeys;
+exports.getMigrationsForVersion = getMigrationsForVersion;
+exports.getOverridesForVersion = getOverridesForVersion;
 exports.getMigrationString = getMigrationString;
 const chalk_1 = __importDefault(require("chalk"));
 const JS_EXTENSIONS = [
@@ -22,7 +25,7 @@ const CSS_EXTENSIONS = [
     "less",
 ];
 exports.migrations = {
-    "1.0.0": [
+    v1: [
         {
             description: "Runs all codemods for beta -> v1 migration",
             value: "v1-preset",
@@ -48,7 +51,7 @@ exports.migrations = {
             ignoredExtensions: CSS_EXTENSIONS,
         },
     ],
-    "2.0.0": [
+    v2: [
         {
             description: "Patches changed css-variables",
             value: "v2-css",
@@ -74,7 +77,7 @@ exports.migrations = {
             ignoredExtensions: JS_EXTENSIONS,
         },
     ],
-    "v3.0.0": [
+    v3: [
         {
             description: "Replaces deprecated <CopyToClipboard /> with <CopyButton />",
             value: "v3-copybutton",
@@ -83,7 +86,7 @@ exports.migrations = {
             ignoredExtensions: CSS_EXTENSIONS,
         },
     ],
-    "v4.0.0": [
+    v4: [
         {
             description: "Replaced deprecated 'internal'-component import to 'core'-imports",
             value: "v4-internal-react",
@@ -105,7 +108,7 @@ exports.migrations = {
             ignoredExtensions: CSS_EXTENSIONS,
         },
     ],
-    "v6.0.0": [
+    v6: [
         {
             description: "Removes `backgroundColor` and `avatarBgColor` properties from `Chat` and `Chat.Bubble`",
             value: "v6-chat",
@@ -114,7 +117,7 @@ exports.migrations = {
             ignoredExtensions: CSS_EXTENSIONS,
         },
     ],
-    "v8.0.0": [
+    v8: [
         {
             description: "Updates Box with legacy-tokens to Box using the new token system, and renames already migrated BoxNew/Box.New instances to Box.",
             value: "v8-box",
@@ -216,6 +219,26 @@ function getMigrationNames() {
         .flat()
         .map((x) => x.value);
 }
+/**
+ * Returns all available version keys from the migrations object.
+ */
+function getVersionKeys() {
+    return Object.keys(exports.migrations);
+}
+/**
+ * Returns the migrations available for a specific version.
+ */
+function getMigrationsForVersion(version) {
+    var _a;
+    return (_a = exports.migrations[version]) !== null && _a !== void 0 ? _a : [];
+}
+/**
+ * Returns the override migrations available for a specific version.
+ */
+function getOverridesForVersion(version) {
+    var _a;
+    return (_a = exports.migrationStringOverride[version]) !== null && _a !== void 0 ? _a : [];
+}
 /**
  * Allows injecting additional migration names that are not part of the main migrations-list.
  * This is used for interactive migrations that should not be part of the main list.
@@ -224,7 +247,7 @@ function getMigrationNames() {
  * which is not the case for interactive migrations that are handled differently.
  */
 exports.migrationStringOverride = {
-    "v8.0.0": [
+    v8: [
         {
             value: "v8-tokens",
             description: "Starts interactive token migration for v8",
@@ -243,5 +266,8 @@ function getMigrationString() {
             str += `${chalk_1.default.blue(migration.value)}: ${migration.description}\n`;
         });
     });
+    str += `\n${chalk_1.default.bold(chalk_1.default.blueBright("Interactive version selection:"))}\n`;
+    str += chalk_1.default.gray("Run with a version key to interactively select migrations:\n");
+    str += chalk_1.default.blue(getVersionKeys().join(", "));
     return str;
 }

package/dist/codemod/run-codeshift.js

@@ -63,7 +63,6 @@ function runCodeshift(input, options, program) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
         const codemodPath = node_path_1.default.join(__dirname, `./transforms/${(0, migrations_1.getMigrationPath)(input)}.js`);
-        console.info(chalk_1.default.greenBright.bold("\nWelcome to Aksel codemods!"));
         console.info("\nRunning migration:", chalk_1.default.green(input));
         const globList = (_a = options.glob) !== null && _a !== void 0 ? _a : (0, codeshift_utils_1.getDefaultGlob)(options === null || options === void 0 ? void 0 : options.ext);
         console.info(chalk_1.default.gray(`Using glob pattern(s): ${globList}\nWorking directory: ${process.cwd()}\n`));

package/dist/codemod/run-version-migration.js

@@ -0,0 +1,85 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runVersionMigration = runVersionMigration;
+exports.validateVersion = validateVersion;
+const chalk_1 = __importDefault(require("chalk"));
+const enquirer_1 = __importDefault(require("enquirer"));
+const migrations_js_1 = require("./migrations.js");
+const run_codeshift_js_1 = require("./run-codeshift.js");
+const validation_js_1 = require("./validation.js");
+/**
+ * Validates that the provided version key exists in the migrations object.
+ */
+function validateVersion(version, program) {
+    const versionKeys = (0, migrations_js_1.getVersionKeys)();
+    if (!versionKeys.includes(version)) {
+        program.error(chalk_1.default.red(`Version <${version}> not found!\n${chalk_1.default.gray(`\nAvailable versions:\n${versionKeys.map((v) => `  ${v}`).join("\n")}`)}`));
+    }
+}
+/**
+ * Runs interactive migration selection for a specific version.
+ */
+function runVersionMigration(version, options, program, 
+/**
+ * Handler for override migrations that need special handling (e.g., v8-tokens).
+ * If provided and an override migration is selected, this will be called instead of runCodeshift.
+ */
+overrideHandler) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const availableMigrations = (0, migrations_js_1.getMigrationsForVersion)(version);
+        const overrideMigrations = (0, migrations_js_1.getOverridesForVersion)(version);
+        if (availableMigrations.length === 0 && overrideMigrations.length === 0) {
+            program.error(chalk_1.default.red(`No migrations found for version ${version}`));
+        }
+        console.info(chalk_1.default.greenBright.bold(`\nAvailable migrations for ${version}:\n`));
+        const overrideValues = new Set(overrideMigrations.map((m) => m.value));
+        const choices = [
+            ...overrideMigrations.map((migration) => ({
+                name: migration.value,
+                message: `${chalk_1.default.blue(migration.value)}: ${chalk_1.default.gray(migration.description)}`,
+                value: migration.value,
+            })),
+            ...availableMigrations.map((migration) => ({
+                name: migration.value,
+                message: `${chalk_1.default.blue(migration.value)}: ${chalk_1.default.gray(migration.description)}`,
+                value: migration.value,
+            })),
+        ];
+        const response = yield enquirer_1.default.prompt({
+            type: "multiselect",
+            name: "selectedMigrations",
+            message: `Select migrations to run for ${version}`,
+            choices,
+        });
+        const { selectedMigrations } = response;
+        if (selectedMigrations.length === 0) {
+            console.info(chalk_1.default.yellow("\nNo migrations selected. Exiting."));
+            return;
+        }
+        console.info(chalk_1.default.gray(`\nRunning ${selectedMigrations.length} migration(s): ${selectedMigrations.join(", ")}\n`));
+        (0, validation_js_1.validateGit)(options, program);
+        for (const migration of selectedMigrations) {
+            console.info(chalk_1.default.blue(`\n\n--- Running: ${migration} ---`));
+            /* Check if this is an override migration that needs special handling */
+            if (overrideValues.has(migration) && overrideHandler) {
+                yield overrideHandler(migration);
+            }
+            else {
+                yield (0, run_codeshift_js_1.runCodeshift)(migration, options, program);
+            }
+        }
+        console.info(chalk_1.default.greenBright.bold("\nAll selected migrations completed!"));
+    });
+}

package/dist/codemod/transforms/v8.0.0/primitives-spacing/spacing.js

@@ -14,7 +14,7 @@ function transformer(file, api) {
         "Box",
         "Box.New",
         "BoxNew",
-        "Hgrid",
+        "HGrid",
         "Stack",
         "HStack",
         "VStack",

package/dist/darkside/index.js

@@ -9,6 +9,7 @@ const commander_1 = require("commander");
 const run_tooling_js_1 = require("./run-tooling.js");
 const program = new commander_1.Command();
 function darksideCommand() {
+    program.allowExcessArguments();
     program.name(`${chalk_1.default.blueBright(`npx @navikt/aksel v8-tokens`)}`);
     program
         .option("-g, --glob [glob]", "Globbing pattern, overrides --ext! Run with 'noglob' if using zsh-terminal. ")

package/dist/index.js

@@ -22,9 +22,12 @@ const version_1 = require("./version");
 run();
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
-        const program = new commander_1.Command();
+        let program = new commander_1.Command();
         program.version(version_1.VERSION, "-v, --version");
-        program.allowUnknownOption().helpOption(false);
+        program = program
+            .allowUnknownOption()
+            .allowExcessArguments()
+            .helpOption(false);
         program.parse();
         const args = program.args;
         if (args.length === 0 || args[0] === "help") {
@@ -36,7 +39,11 @@ function run() {
                 (0, darkside_1.darksideCommand)();
                 return;
             }
-            (0, index_1.codemodCommand)();
+            (0, index_1.codemodCommand)((migration) => {
+                if (migration === "v8-tokens") {
+                    (0, darkside_1.darksideCommand)();
+                }
+            });
             return;
         }
         console.info(chalk_1.default.red(`Unknown command: ${args[0]}.\nRun ${chalk_1.default.cyan("npx @navikt/aksel help")} for all available commands.`));

package/dist/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-exports.VERSION = "7.37.0";
+exports.VERSION = "7.39.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel",
-  "version": "7.37.0",
+  "version": "7.39.0",
   "description": "Aksel command line interface. Codemods and other utilities for Aksel users.",
   "author": "Aksel | Nav designsystem team",
   "license": "MIT",
@@ -33,12 +33,12 @@
     "url": "https://github.com/navikt/aksel/issues"
   },
   "dependencies": {
-    "@navikt/ds-css": "^7.37.0",
-    "@navikt/ds-tokens": "^7.37.0",
+    "@navikt/ds-css": "^7.39.0",
+    "@navikt/ds-tokens": "^7.39.0",
     "chalk": "5.6.2",
     "cli-progress": "3.12.0",
     "clipboardy": "5.0.1",
-    "commander": "10.0.1",
+    "commander": "14.0.2",
     "enquirer": "2.4.1",
     "fast-glob": "3.2.11",
     "figlet": "1.8.0",