apify-cli 0.19.2-beta.0 → 0.19.2-beta.2

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "apify-cli",
-  "version": "0.19.2-beta.0",
+  "version": "0.19.2-beta.2",
   "description": "Apify command-line interface helps you create, develop, build and run Apify actors, and manage the Apify cloud platform.",
   "main": "index.js",
   "scripts": {
-    "test": "cross-env APIFY_CLI_SKIP_UPDATE_CHECK=1 mocha --timeout 180000 --recursive",
-    "test-python": "npm run test -- --grep '\\[python\\]'",
+    "test": "cross-env APIFY_CLI_SKIP_UPDATE_CHECK=1 vitest run",
+    "test-python": "cross-env APIFY_CLI_SKIP_UPDATE_CHECK=1 vitest run -t '.*\\[python\\]'",
     "lint": "eslint src test",
     "lint:fix": "eslint src test --fix",
     "commands-md": "npm run manifest && oclif-dev readme",
@@ -98,12 +98,9 @@
     "@apify/eslint-config": "^0.4.0",
     "@oclif/dev-cli": "^1.26.0",
     "@oclif/test": "^2.1.0",
-    "chai": "^4.3.4",
-    "chai-match": "^1.1.1",
     "cross-env": "^7.0.3",
     "eslint": "^8.53.0",
-    "mocha": "^10.0.0",
-    "sinon": "^17.0.0"
+    "vitest": "^1.0.4"
   },
   "oclif": {
     "bin": "apify",

package/src/commands/init.js

@@ -9,7 +9,7 @@ const { createPrefilledInputFileFromInputSchema } = require('../lib/input_schema
 const outputs = require('../lib/outputs');
 const { ProjectAnalyzer } = require('../lib/project_analyzer');
 const { wrapScrapyProject } = require('../lib/scrapy-wrapper');
-const { setLocalConfig, setLocalEnv, getLocalConfig, getLocalConfigOrThrow, detectLocalActorLanguage } = require('../lib/utils');
+const { setLocalConfig, setLocalEnv, getLocalConfig, getLocalConfigOrThrow, detectLocalActorLanguage, validateActorName } = require('../lib/utils');
 
 class InitCommand extends ApifyCommand {
     async run() {
@@ -34,8 +34,19 @@ class InitCommand extends ApifyCommand {
             outputs.warning(`Skipping creation of "${LOCAL_CONFIG_PATH}", the file already exists in the current directory.`);
         } else {
             if (!actorName) {
-                const answer = await inquirer.prompt([{ name: 'actName', message: 'Actor name:', default: path.basename(cwd) }]);
-                ({ actName: actorName } = answer);
+                let response = null;
+
+                while (!response) {
+                    try {
+                        const answer = await inquirer.prompt([{ name: 'actName', message: 'Actor name:', default: path.basename(cwd) }]);
+                        validateActorName(answer.actName);
+                        response = answer;
+                    } catch (err) {
+                        outputs.error(err.message);
+                    }
+                }
+
+                ({ actName: actorName } = response);
             }
             // Migrate apify.json to .actor/actor.json
             const localConfig = { ...EMPTY_LOCAL_CONFIG, ...await getLocalConfigOrThrow() };

package/src/lib/scrapy-wrapper/index.js

@@ -9,7 +9,7 @@ const inquirer = require('inquirer');
 
 const { ScrapyProjectAnalyzer } = require('./ScrapyProjectAnalyzer');
 const outputs = require('../outputs');
-const { downloadAndUnzip } = require('../utils');
+const { downloadAndUnzip, sanitizeActorName } = require('../utils');
 
 /**
  * Files that should be concatenated instead of copied (and overwritten).
@@ -86,7 +86,7 @@ async function wrapScrapyProject({ projectPath }) {
     }
 
     const templateBindings = {
-        botName: analyzer.settings.BOT_NAME,
+        botName: sanitizeActorName(analyzer.settings.BOT_NAME),
         scrapy_settings_module: analyzer.configuration.get('settings', 'default'),
         apify_module_path: `${analyzer.settings.BOT_NAME}.apify`,
         spider_class_name: analyzer.getAvailableSpiders()[spiderIndex].class_name,

package/src/lib/utils.js

@@ -536,6 +536,19 @@ const validateActorName = (actorName) => {
     }
 };
 
+const sanitizeActorName = (actorName) => {
+    let sanitizedName = actorName
+        .replaceAll(/[^a-zA-Z0-9-]/g, '-');
+
+    if (sanitizedName.length < ACTOR_NAME.MIN_LENGTH) {
+        sanitizedName = `${sanitizedName}-apify-actor`;
+    }
+
+    sanitizedName = sanitizedName.replaceAll(/^-+/g, '').replaceAll(/-+$/g, '');
+
+    return sanitizedName.slice(0, ACTOR_NAME.MAX_LENGTH);
+};
+
 const getPythonCommand = (directory) => {
     const pythonVenvPath = /^win/.test(process.platform)
         ? 'Scripts/python.exe'
@@ -665,4 +678,5 @@ module.exports = {
     detectNpmVersion,
     detectLocalActorLanguage,
     downloadAndUnzip,
+    sanitizeActorName,
 };