chore: rebase issues

Author: vladfrangu

eslint.config.mjs

@@ -80,7 +80,7 @@ export default [
 			'no-restricted-syntax': [
 				'error',
 				{
-					'selector': "CallExpression[callee.object.name='LoginCommand'][callee.property.name='run']",
+					'selector': "ExpressionStatement[expression.argument.arguments.0.name='LoginCommand']",
 					'message': 'Use safeLogin() from test/__setup__/hooks/useAuthSetup.ts instead',
 				},
 			],

src/commands/_register.ts

@@ -1,3 +1,4 @@
+import type { BuiltApifyCommand } from '../lib/command-framework/apify-command.js';
 import { ActorIndexCommand } from './actor/_index.js';
 import { ActorsIndexCommand } from './actors/_index.js';
 import { BuildsIndexCommand } from './builds/_index.js';
@@ -7,8 +8,8 @@ import { CreateCommand } from './create.js';
 import { DatasetsIndexCommand } from './datasets/_index.js';
 import { EditInputSchemaCommand } from './edit-input-schema.js';
 import { InfoCommand } from './info.js';
-import { WrapScrapyCommand } from './init-wrap-scrapy.js';
 import { InitCommand } from './init.js';
+import { WrapScrapyCommand } from './init-wrap-scrapy.js';
 import { KeyValueStoresIndexCommand } from './key-value-stores/_index.js';
 import { LoginCommand } from './login.js';
 import { LogoutCommand } from './logout.js';
@@ -20,7 +21,6 @@ import { RunsIndexCommand } from './runs/_index.js';
 import { SecretsIndexCommand } from './secrets/_index.js';
 import { TasksIndexCommand } from './task/_index.js';
 import { ValidateInputSchemaCommand } from './validate-schema.js';
-import type { BuiltApifyCommand } from '../lib/command-framework/apify-command.js';
 
 export const apifyCommands = [
 	// namespaces

src/commands/actor/_index.ts

@@ -1,10 +1,10 @@
+import { ApifyCommand } from '../../lib/command-framework/apify-command.js';
 import { ActorChargeCommand } from './charge.js';
 import { ActorGetInputCommand } from './get-input.js';
 import { ActorGetPublicUrlCommand } from './get-public-url.js';
 import { ActorGetValueCommand } from './get-value.js';
 import { ActorPushDataCommand } from './push-data.js';
 import { ActorSetValueCommand } from './set-value.js';
-import { ApifyCommand } from '../../lib/command-framework/apify-command.js';
 
 export class ActorIndexCommand extends ApifyCommand<typeof ActorIndexCommand> {
 	static override name = 'actor' as const;

src/commands/actor/charge.ts

@@ -1,4 +1,3 @@
-
 import { APIFY_ENV_VARS } from '@apify/consts';
 
 import { getApifyTokenFromEnvOrAuthFile } from '../../lib/actor.js';

src/commands/actor/get-public-url.ts

@@ -1,5 +1,3 @@
-import { Args } from '@oclif/core';
-
 import { ACTOR_ENV_VARS, APIFY_ENV_VARS } from '@apify/consts';
 import { createHmacSignature } from '@apify/utilities';
 

src/commands/actors/_index.ts

@@ -1,3 +1,4 @@
+import { ApifyCommand } from '../../lib/command-framework/apify-command.js';
 import { ActorsBuildCommand } from './build.js';
 import { ActorsCallCommand } from './call.js';
 import { ActorsInfoCommand } from './info.js';
@@ -6,7 +7,6 @@ import { ActorsPullCommand } from './pull.js';
 import { ActorsPushCommand } from './push.js';
 import { ActorsRmCommand } from './rm.js';
 import { ActorsStartCommand } from './start.js';
-import { ApifyCommand } from '../../lib/command-framework/apify-command.js';
 
 export class ActorsIndexCommand extends ApifyCommand<typeof ActorsIndexCommand> {
 	static override name = 'actors' as const;

src/commands/actors/ls.ts

@@ -4,8 +4,6 @@ import chalk from 'chalk';
 
 import type { ACTOR_JOB_STATUSES } from '@apify/consts';
 
-import type { ACTOR_JOB_STATUSES } from '@apify/consts';
-
 import { ApifyCommand } from '../../lib/command-framework/apify-command.js';
 import { Flags } from '../../lib/command-framework/flags.js';
 import { prettyPrintStatus } from '../../lib/commands/pretty-print-status.js';

src/commands/actors/push.ts

@@ -10,9 +10,6 @@ import open from 'open';
 import { fetchManifest } from '@apify/actor-templates';
 import { ACTOR_JOB_STATUSES, ACTOR_SOURCE_TYPES, MAX_MULTIFILE_BYTES } from '@apify/consts';
 
-import { fetchManifest } from '@apify/actor-templates';
-import { ACTOR_JOB_STATUSES, ACTOR_SOURCE_TYPES, MAX_MULTIFILE_BYTES } from '@apify/consts';
-
 import { ApifyCommand } from '../../lib/command-framework/apify-command.js';
 import { Args } from '../../lib/command-framework/args.js';
 import { Flags } from '../../lib/command-framework/flags.js';

src/commands/builds/_index.ts

@@ -1,9 +1,9 @@
+import { ApifyCommand } from '../../lib/command-framework/apify-command.js';
 import { BuildsCreateCommand } from './create.js';
 import { BuildsInfoCommand } from './info.js';
 import { BuildsLogCommand } from './log.js';
 import { BuildsLsCommand } from './ls.js';
 import { BuildsRmCommand } from './rm.js';
-import { ApifyCommand } from '../../lib/command-framework/apify-command.js';
 
 export class BuildsIndexCommand extends ApifyCommand<typeof BuildsIndexCommand> {
 	static override name = 'builds' as const;

src/commands/create.ts

@@ -6,8 +6,6 @@ import { gte, minVersion } from 'semver';
 
 import { fetchManifest, manifestUrl } from '@apify/actor-templates';
 
-import { fetchManifest, manifestUrl } from '@apify/actor-templates';
-
 import { ApifyCommand } from '../lib/command-framework/apify-command.js';
 import { Args } from '../lib/command-framework/args.js';
 import { Flags } from '../lib/command-framework/flags.js';