apify-test-tools 0.8.7-beta.1 → 0.8.7-beta.3

package/bin/test-report.ts

@@ -36,7 +36,7 @@ export const reportTestResults = async ({
         }
     }
 
-    const failedAssertions: { message: string; runLink: string; actorName: string }[] = [];
+    const failedAssertions: { message: string; runLink: string; actorId: string }[] = [];
 
     console.error();
     console.error(`PASSED: ${passed.length}, FAILED: ${failed.length}`);
@@ -62,7 +62,7 @@ export const reportTestResults = async ({
                 ...failureMessages.map((message) => ({
                     message: message.split('\n')?.[0],
                     runLink: meta.runLink,
-                    actorName: meta.actorName,
+                    actorId: meta.actorId,
                 })),
             );
         }
@@ -89,10 +89,10 @@ export const reportTestResults = async ({
     const jobLink = jobUrl ? ` Check <${jobUrl}|the job>.` : '';
     let slackMessage = `\`${workflowName ?? '-'}\``;
     slackMessage += `: has ${failedAssertions.length} failed assertions. Failing test suites: ${failed.length}/${total}.${jobLink}`;
-    slackMessage += `\n\n${failedAssertions[0].message} --- <${failedAssertions[0].runLink}|${failedAssertions[0].actorName}>`;
+    slackMessage += `\n\n${failedAssertions[0].message} --- <${failedAssertions[0].runLink}|${failedAssertions[0].actorId}>`;
     const blocks = failedAssertions
         .slice(1)
-        .map(({ message, runLink, actorName }) => `• ${message} --- <${runLink}|${actorName}>`);
+        .map(({ message, runLink, actorId }) => `• ${message} --- <${runLink}|${actorId}>`);
 
     console.error('SLACK:', slackMessage);
     console.error('\tblocks:', blocks.join('\n\t\t'));
@@ -122,7 +122,7 @@ interface JsonAssertionResult {
     meta: {
         runId: string;
         runLink: string;
-        actorName: string;
+        actorId: string;
     };
     duration?: Milliseconds | null;
     failureMessages: string[] | null;

package/bin/types.ts

@@ -3,6 +3,8 @@ export interface Config {
     sourceBranch: string;
     baseCommit?: string;
     workspace?: string;
+    actors: string[];
+    ignore: string[];
 }
 
 export type Commit = {
@@ -85,16 +87,28 @@ export interface GithubCommit {
     modified: string[];
 }
 
+export interface ActorConfigFileEntry {
+    folder: string;
+    actorFullName: string;
+    tokenEnvVar: string;
+    overrideActorContext?: string[];
+}
+
+export interface ActorConfigFile {
+    actors: ActorConfigFileEntry[];
+}
+
 export interface BuildData {
     buildId: string;
-    actorId: string;
-    actorName: string;
-    // folder: string | undefined;
+    actorRawId: string;
+    actorFullName: string;
     buildNumber: string;
 }
 
 export interface ActorConfig {
-    actorName: string;
+    actorFullName: string;
     folder: string;
-    isStandalone: boolean;
+    tokenEnvVar: string;
+    dockerContextDir: string;
+    contextPaths: string[];
 }

package/bin/utils.ts

@@ -1,14 +1,14 @@
 import { spawnSync } from 'node:child_process';
-import fsSync from 'node:fs';
 import fs from 'node:fs/promises';
-import os from 'node:os';
 import path from 'node:path';
 
 import type { ActorVersionSourceFile } from 'apify-client';
 
 import { SOURCE_FILE_FORMATS } from '@apify/consts';
 
-import type { ActorConfig } from './types.js';
+import { selectActors } from './actor-filtering.js';
+import { isPathWithinScope } from './path-utils.js';
+import type { ActorConfig, ActorConfigFile } from './types.js';
 
 // Returns true when `childPath` is not inside `parentPath`.
 // Used to detect monorepo actors whose dockerContextDir escapes the actor directory.
@@ -59,65 +59,6 @@ export const getGitignoredPaths = (relativePaths: string[]): Set<string> => {
     return new Set(result.stdout.toString().split('\n').filter(Boolean));
 };
 
-// Docker normalizes each pattern before matching, so a leading "./" (as in the common "./node_modules"
-// style) is a no-op for Docker. git's ignore engine has no such normalization — it treats "./" as
-// literal pattern text that can never match a real path, so a .dockerignore written in that style
-// would otherwise silently match nothing under git. Strip it here (after any negation prefix) so
-// git sees the same effective pattern Docker would.
-const normalizeDockerignorePattern = (line: string): string => line.replace(/^(!?)(?:\.\/)+/, '$1');
-
-/**
- * Given paths relative to `rootDir`, returns the subset that a `.dockerignore` file sitting at
- * `rootDir` would exclude — mirroring getGitignoredPaths, but for Docker's own ignore file. `git
- * check-ignore` has no built-in notion of .dockerignore, but pointing `core.excludesFile` at a
- * normalized copy of it for a single invocation makes git apply its patterns exactly like a
- * .gitignore, without re-implementing gitignore-style pattern matching ourselves. A missing
- * .dockerignore is a no-op (empty set), so there's no need to check for its existence first.
- *
- * Crucially this passes `--no-index`: by default git never reports an already-tracked file as
- * ignored (that's how real .gitignore semantics work — tracked files aren't affected by ignore
- * rules), but Docker excludes a matching path from the build context unconditionally, regardless
- * of git tracking. `--no-index` makes git apply the patterns uniformly, matching Docker's behavior.
- */
-export const getDockerignoredPaths = (rootDir: string, relativePaths: string[]): Set<string> => {
-    if (relativePaths.length === 0) return new Set();
-
-    let dockerignoreContent: string;
-    try {
-        dockerignoreContent = fsSync.readFileSync(path.join(rootDir, '.dockerignore'), 'utf8');
-    } catch {
-        return new Set();
-    }
-
-    const normalizedContent = dockerignoreContent.split('\n').map(normalizeDockerignorePattern).join('\n');
-
-    const tempDir = fsSync.mkdtempSync(path.join(os.tmpdir(), 'apify-dockerignore-'));
-    try {
-        const normalizedPath = path.join(tempDir, '.dockerignore');
-        fsSync.writeFileSync(normalizedPath, normalizedContent);
-
-        const result = spawnSync(
-            'git',
-            ['-c', `core.excludesFile=${normalizedPath}`, 'check-ignore', '--no-index', '--stdin'],
-            {
-                cwd: rootDir,
-                input: relativePaths.join('\n'),
-                maxBuffer: 100 * 1024 * 1024,
-            },
-        );
-
-        // Exit code 1 means none of the given paths are ignored - not an error. Anything else
-        // (e.g. 128 for "not a git repository") is a real failure.
-        if (result.status !== 0 && result.status !== 1) {
-            throw new Error(`[Command failed]: git check-ignore (dockerignore)\n${result.stderr.toString()}`);
-        }
-
-        return new Set(result.stdout.toString().split('\n').filter(Boolean));
-    } finally {
-        fsSync.rmSync(tempDir, { recursive: true, force: true });
-    }
-};
-
 const isBinary = (buffer: Buffer): boolean => buffer.includes(0);
 
 export const toActorVersionSourceFile = async (absPath: string, rootDir: string): Promise<ActorVersionSourceFile> => {
@@ -154,51 +95,138 @@ export const getEnvVar = (varName: string, defaultValue?: string): string => {
     return value;
 };
 
-/**
- * Reads and parses all directories in `actors` directory
- * This works locally if checkoutRepoLocally is called first
- */
-export const getRepoActors = async (): Promise<ActorConfig[]> => {
-    let actorDirs: string[];
+export const CONFIG_FILE_NAME = 'apify-test-tools.config.json';
+
+// Strips a trailing slash so config-declared paths ("actors/shopify/" vs "actors/shopify") compare equal.
+const stripTrailingSlash = (pathValue: string): string => pathValue.replace(/\/+$/, '');
+
+const findOverlappingContextPaths = (contextPaths: string[]): [string, string] | undefined => {
+    for (let i = 0; i < contextPaths.length; i++) {
+        for (let j = i + 1; j < contextPaths.length; j++) {
+            if (
+                isPathWithinScope(contextPaths[i], contextPaths[j]) ||
+                isPathWithinScope(contextPaths[j], contextPaths[i])
+            ) {
+                return [contextPaths[i], contextPaths[j]];
+            }
+        }
+    }
+    return undefined;
+};
+
+export const readConfigFile = async (selection: { actors: string[]; ignore: string[] }): Promise<ActorConfig[]> => {
+    let raw: string;
     try {
-        actorDirs = (await fs.readdir(`./actors`)).map((dir) => `actors/${dir}`);
+        raw = await fs.readFile(CONFIG_FILE_NAME, 'utf-8');
     } catch {
-        console.warn(`No /actors directory found in repo`);
-        actorDirs = [];
+        throw new Error(
+            `Config file "${CONFIG_FILE_NAME}" not found in the current directory. ` +
+                `Please create one with the required actor entries.`,
+        );
     }
-    let standaloneActorDirs: string[];
+
+    let config: ActorConfigFile;
     try {
-        standaloneActorDirs = (await fs.readdir(`./standalone-actors`)).map((dir) => `standalone-actors/${dir}`);
+        config = JSON.parse(raw);
     } catch {
-        console.warn(`No /standalone-actors directory found in repo`);
-        standaloneActorDirs = [];
+        throw new Error(`Config file "${CONFIG_FILE_NAME}" contains invalid JSON.`);
+    }
+
+    if (!Array.isArray(config.actors)) {
+        throw new Error(`Config file "${CONFIG_FILE_NAME}" must have an "actors" array at the top level.`);
     }
+
+    const seenFolders = new Set<string>();
     const actorConfigs: ActorConfig[] = [];
-    for (const actorDir of [...actorDirs, ...standaloneActorDirs]) {
-        const match = actorDir.match(/^([^/]+)\/(.+)_([^_]+)$/);
-        if (!match) {
-            throw new Error(`Invalid actor directory name. Got "${actorDir}", expected "actor.owner-name_actor-name"`);
+
+    for (const [index, entry] of config.actors.entries()) {
+        if (typeof entry.folder !== 'string') {
+            throw new Error(
+                `Invalid "folder" for actor entry at index ${index} in "${CONFIG_FILE_NAME}". ` +
+                    `Must be a string (use "." for a single-actor repo).`,
+            );
         }
-        const [, folderType, owner, actorName] = match;
+
+        const folder = entry.folder === '.' ? '' : stripTrailingSlash(entry.folder);
+
+        if (seenFolders.has(folder)) {
+            throw new Error(
+                `Duplicate folder "${entry.folder}" in "${CONFIG_FILE_NAME}". Each actor must have a unique folder.`,
+            );
+        }
+        seenFolders.add(folder);
+
+        const nameParts = entry.actorFullName?.split('/');
+        if (!nameParts || nameParts.length !== 2 || !nameParts[0] || !nameParts[1]) {
+            throw new Error(
+                `Invalid "actorFullName" for folder "${entry.folder}" in "${CONFIG_FILE_NAME}". ` +
+                    `Must be in "owner/name" format (e.g. "apify/web-scraper").`,
+            );
+        }
+
+        if (entry.overrideActorContext !== undefined) {
+            if (
+                !Array.isArray(entry.overrideActorContext) ||
+                !entry.overrideActorContext.every((p) => typeof p === 'string')
+            ) {
+                throw new Error(
+                    `Invalid "overrideActorContext" for folder "${entry.folder}" in "${CONFIG_FILE_NAME}". ` +
+                        `Must be an array of strings.`,
+                );
+            }
+        }
+
+        const actorJsonPath = folder ? `${folder}/.actor/actor.json` : '.actor/actor.json';
+
+        let actorJson: { dockerContextDir?: string };
+        try {
+            actorJson = JSON.parse(await fs.readFile(actorJsonPath, 'utf-8'));
+        } catch {
+            throw new Error(
+                `Cannot read "${actorJsonPath}". Every actor entry in "${CONFIG_FILE_NAME}" ` +
+                    `must have a corresponding .actor/actor.json file.`,
+            );
+        }
+
+        const actorDotDir = folder ? `${folder}/.actor` : '.actor';
+        const rawDockerContextDir = actorJson.dockerContextDir ?? '..';
+        const resolved = path.resolve(process.cwd(), actorDotDir, rawDockerContextDir);
+        const dockerContextDir = path.relative(process.cwd(), resolved);
+
+        if (dockerContextDir.startsWith('..')) {
+            throw new Error(
+                `"dockerContextDir" for folder "${entry.folder}" resolves outside the repository root. ` +
+                    `Resolved path: "${dockerContextDir}".`,
+            );
+        }
+
+        const normalizedDockerContextDir = dockerContextDir === '.' ? '' : dockerContextDir;
+        const contextPaths = (entry.overrideActorContext ?? [normalizedDockerContextDir]).map(stripTrailingSlash);
+
+        // The actor's own folder is always part of its context. When an explicit "overrideActorContext"
+        // doesn't already cover it, add it automatically instead of failing the workflow.
+        if (!contextPaths.some((contextPath) => isPathWithinScope(folder, contextPath))) {
+            contextPaths.push(folder);
+        }
+
+        const overlap = findOverlappingContextPaths(contextPaths);
+        if (overlap) {
+            throw new Error(
+                `Invalid context paths for folder "${entry.folder}" in "${CONFIG_FILE_NAME}": ` +
+                    `"${overlap[0]}" and "${overlap[1]}" overlap. Context paths must not be prefixes of one another.`,
+            );
+        }
+
         actorConfigs.push({
-            actorName: `${owner}/${actorName}`,
-            folder: actorDir,
-            isStandalone: folderType === 'standalone-actors',
+            actorFullName: entry.actorFullName,
+            folder,
+            tokenEnvVar: entry.tokenEnvVar,
+            dockerContextDir: normalizedDockerContextDir,
+            contextPaths,
         });
     }
-    console.error(
-        `Actors in repo: ${actorConfigs
-            .filter(({ isStandalone }) => !isStandalone)
-            .map(({ actorName }) => actorName)
-            .join(', ')}`,
-    );
-    console.error(
-        `Standalone actors in repo: ${actorConfigs
-            .filter(({ isStandalone }) => !!isStandalone)
-            .map(({ actorName }) => actorName)
-            .join(', ')}`,
-    );
-    return actorConfigs;
+
+    return selectActors(selection, actorConfigs);
 };
 
 export const setCwd = ({ workspace }: { workspace: string | undefined }) => {

package/dist/bin/actor-filtering.d.ts

@@ -0,0 +1,13 @@
+import type { ActorConfig } from './types.js';
+/**
+ * Restricts a set of actors to those selected via `--actors` and not excluded via `--ignore`.
+ * Both filters match on `actorFullName` (`owner/name`). `--actors` is applied first (empty means
+ * "all"), then `--ignore` removes from the result. A name that doesn't exist in the config throws —
+ * a malformed selection must never silently build/release/delete the wrong set. The caller is
+ * responsible for turning that into a non-zero exit.
+ */
+export declare function selectActors({ actors, ignore }: {
+    actors: string[];
+    ignore: string[];
+}, actorConfigs: ActorConfig[]): ActorConfig[];
+//# sourceMappingURL=actor-filtering.d.ts.map

package/dist/bin/actor-filtering.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"actor-filtering.d.ts","sourceRoot":"","sources":["../../bin/actor-filtering.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,EAAE,YAAY,EAAE,WAAW,EAAE,iBAWnH"}

package/dist/bin/actor-filtering.js

@@ -0,0 +1,19 @@
+/**
+ * Restricts a set of actors to those selected via `--actors` and not excluded via `--ignore`.
+ * Both filters match on `actorFullName` (`owner/name`). `--actors` is applied first (empty means
+ * "all"), then `--ignore` removes from the result. A name that doesn't exist in the config throws —
+ * a malformed selection must never silently build/release/delete the wrong set. The caller is
+ * responsible for turning that into a non-zero exit.
+ */
+export function selectActors({ actors, ignore }, actorConfigs) {
+    const fullNames = actorConfigs.map((actor) => actor.actorFullName);
+    const missing = [...actors, ...ignore].filter((name) => !fullNames.includes(name));
+    if (missing.length > 0) {
+        throw new Error(`The following actors from the filter config do not exist: ${missing.join(', ')}`);
+    }
+    const afterOnly = actors.length
+        ? actorConfigs.filter((actor) => actors.includes(actor.actorFullName))
+        : actorConfigs;
+    return afterOnly.filter((actor) => !ignore.includes(actor.actorFullName));
+}
+//# sourceMappingURL=actor-filtering.js.map

package/dist/bin/actor-filtering.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"actor-filtering.js","sourceRoot":"","sources":["../../bin/actor-filtering.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,EAA0C,EAAE,YAA2B;IAChH,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACnE,MAAM,OAAO,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACnF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,6DAA6D,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACvG,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM;QAC3B,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACtE,CAAC,CAAC,YAAY,CAAC;IACnB,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;AAC9E,CAAC"}

package/dist/bin/build-from-local.d.ts

@@ -1,8 +1,8 @@
 import type { ActorVersionSourceFile } from 'apify-client';
 import type { ActorConfig, BuildData } from './types.js';
 export declare const collectSourceFiles: (actorName: string, actorDir: string) => Promise<ActorVersionSourceFile[]>;
-export declare const collectNonIgnoredFiles: (rootDir: string, repoRoot: string) => string[];
-export declare const flattenMonorepoContext: (actorName: string, absActorDir: string, contextAbsDir: string, actorJson: Record<string, unknown>, keptContextFiles: string[], repoRoot: string) => Promise<{
+export declare const collectNonIgnoredFiles: (dockerContextDir: string, repoRoot: string) => string[];
+export declare const flattenMonorepoContext: (actorName: string, absActorDir: string, contextAbsDir: string, actorJson: Record<string, unknown>, keptContextFiles: string[]) => Promise<{
     tempDir: string;
     filePaths: string[];
 }>;

package/dist/bin/build-from-local.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-from-local.d.ts","sourceRoot":"","sources":["../../bin/build-from-local.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAG3D,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAgBzD,eAAO,MAAM,kBAAkB,GAAU,WAAW,MAAM,EAAE,UAAU,MAAM,KAAG,OAAO,CAAC,sBAAsB,EAAE,CAkC9G,CAAC;AAWF,eAAO,MAAM,sBAAsB,GAAI,SAAS,MAAM,EAAE,UAAU,MAAM,KAAG,MAAM,EAoBhF,CAAC;AAaF,eAAO,MAAM,sBAAsB,GAC/B,WAAW,MAAM,EACjB,aAAa,MAAM,EACnB,eAAe,MAAM,EACrB,WAAW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,kBAAkB,MAAM,EAAE,EAC1B,UAAU,MAAM,KACjB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAuClD,CAAC;AAcF,eAAO,MAAM,qBAAqB,GAC9B,aAAa,MAAM,EACnB,eAAe,MAAM,EACrB,SAAS,MAAM,EACf,WAAW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KACnC,OAAO,CAAC,IAAI,CAqBd,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAU,2BAGtC;IACC,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,MAAM,EAAE,OAAO,CAAC;CACnB,KAAG,OAAO,CAAC,SAAS,EAAE,CAyBtB,CAAC"}
+{"version":3,"file":"build-from-local.d.ts","sourceRoot":"","sources":["../../bin/build-from-local.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAK3D,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAUzD,eAAO,MAAM,kBAAkB,GAAU,WAAW,MAAM,EAAE,UAAU,MAAM,KAAG,OAAO,CAAC,sBAAsB,EAAE,CAmC9G,CAAC;AAWF,eAAO,MAAM,sBAAsB,GAAI,kBAAkB,MAAM,EAAE,UAAU,MAAM,KAAG,MAAM,EAoBzF,CAAC;AAaF,eAAO,MAAM,sBAAsB,GAC/B,WAAW,MAAM,EACjB,aAAa,MAAM,EACnB,eAAe,MAAM,EACrB,WAAW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,kBAAkB,MAAM,EAAE,KAC3B,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAyClD,CAAC;AAcF,eAAO,MAAM,qBAAqB,GAC9B,aAAa,MAAM,EACnB,eAAe,MAAM,EACrB,SAAS,MAAM,EACf,WAAW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KACnC,OAAO,CAAC,IAAI,CAqBd,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAU,2BAGtC;IACC,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,MAAM,EAAE,OAAO,CAAC;CACnB,KAAG,OAAO,CAAC,SAAS,EAAE,CA4BtB,CAAC"}

package/dist/bin/build-from-local.js

@@ -2,7 +2,9 @@ import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import { ApifyBuilder, waitAndSummarizeBuilds } from './build.js';
-import { getDockerignoredPaths, getGitignoredPaths, isOutsideDir, listRepoFilePaths, toActorVersionSourceFile, } from './utils.js';
+import { buildDockerIgnoreMatcher } from './dockerignore.js';
+import { isPathWithinScope } from './path-utils.js';
+import { getGitignoredPaths, isOutsideDir, listRepoFilePaths, toActorVersionSourceFile } from './utils.js';
 // JUST IN CASE. File patterns that commonly hold credentials — never ship these into a build, regardless
 // of sourceType or of whether the repo's .gitignore happens to list them. Everything else that should be
 // excluded (build output, local overrides, project-specific secret files, ...) is expected to already be
@@ -20,12 +22,12 @@ export const collectSourceFiles = async (actorName, actorDir) => {
     const rawContextDir = actorJson.dockerContextDir;
     const contextAbsDir = rawContextDir ? path.resolve(absActorDir, '.actor', rawContextDir) : undefined;
     const isMonorepoActor = !!contextAbsDir && isOutsideDir(contextAbsDir, absActorDir);
-    const collectRootDir = isMonorepoActor ? contextAbsDir : absActorDir;
-    const keptFilePaths = collectNonIgnoredFiles(collectRootDir, repoRoot);
+    const dockerContextDirAbs = isMonorepoActor ? contextAbsDir : absActorDir;
+    const keptFilePaths = collectNonIgnoredFiles(dockerContextDirAbs, repoRoot);
     if (!isMonorepoActor) {
-        return Promise.all(keptFilePaths.map(async (filePath) => toActorVersionSourceFile(filePath, collectRootDir)));
+        return Promise.all(keptFilePaths.map(async (filePath) => toActorVersionSourceFile(filePath, dockerContextDirAbs)));
     }
-    const { tempDir, filePaths } = await flattenMonorepoContext(actorName, absActorDir, contextAbsDir, actorJson, keptFilePaths, repoRoot);
+    const { tempDir, filePaths } = await flattenMonorepoContext(actorName, absActorDir, contextAbsDir, actorJson, keptFilePaths);
     try {
         return await Promise.all(filePaths.map(async (filePath) => toActorVersionSourceFile(filePath, tempDir)));
     }
@@ -38,19 +40,19 @@ export const collectSourceFiles = async (actorName, actorDir) => {
 // manual directory walk — nested .gitignore files, `.git/info/exclude`, and global excludes are
 // all honored since this delegates to git itself instead of re-implementing gitignore matching,
 // and .git/ is never walked because git never lists its own internals here. `.dockerignore` at
-// `rootDir` (the Docker build context) is honored the same way, since those files would never
-// reach a real Docker build either. `.actor/` (the Actor specification folder) is always kept
+// `dockerContextDir` (the Docker build context) is honored the same way, since those files would
+// never reach a real Docker build either. `.actor/` (the Actor specification folder) is always kept
 // regardless of .gitignore/.dockerignore, matching Apify CLI's own behavior. Files matching the
 // hardcoded secret-pattern backstop (keys, certs, .env variants) are dropped unconditionally,
 // .actor/ included, since those should never ship regardless of what the ignore files say.
-export const collectNonIgnoredFiles = (rootDir, repoRoot) => {
-    const relativePaths = listRepoFilePaths(repoRoot, rootDir);
+export const collectNonIgnoredFiles = (dockerContextDir, repoRoot) => {
+    const relativePaths = listRepoFilePaths(repoRoot, dockerContextDir);
     const ignoredPaths = getGitignoredPaths(relativePaths);
     const rootRelativePaths = new Map(relativePaths.map((relPath) => [
         relPath,
-        path.relative(rootDir, path.join(repoRoot, relPath)).split(path.sep).join('/'),
+        path.relative(dockerContextDir, path.join(repoRoot, relPath)).split(path.sep).join('/'),
     ]));
-    const dockerIgnoredPaths = getDockerignoredPaths(rootDir, [...rootRelativePaths.values()]);
+    const isDockerIgnored = buildDockerIgnoreMatcher(dockerContextDir);
     return relativePaths
         .filter((relPath) => {
         if (isSecretFile(path.basename(relPath)))
@@ -60,7 +62,7 @@ export const collectNonIgnoredFiles = (rootDir, repoRoot) => {
             return true;
         if (ignoredPaths.has(relPath))
             return false;
-        return !dockerIgnoredPaths.has(rootRelativePaths.get(relPath));
+        return !isDockerIgnored(rootRelativePaths.get(relPath));
     })
         .map((relPath) => path.join(repoRoot, relPath));
 };
@@ -68,14 +70,14 @@ export const collectNonIgnoredFiles = (rootDir, repoRoot) => {
 // collect the actor directory of a monorepo actor — the platform would reject any path
 // escaping it. Fix: create a temporary "flattened" directory where:
 //   - the Docker context's non-ignored files (repo root) are copied to the temp dir root
-//   - the actor's .actor/ directory is overlaid at the temp dir root (through the same
-//     gitignore/secret-pattern filter as the rest of the context — see collectNonIgnoredFiles)
+//   - the actor's own .actor/ directory (already present within those same non-ignored files)
+//     is overlaid at the temp dir root instead of its original nested position
 //   - actor.json path fields are rewritten to be relative to the new location
 //
 // Result: the collected root IS the Docker context, .actor/ is at that root, and
 // all relative paths (dockerfile, dockerContextDir, changelog) are exactly one
 // level up ("..") instead of three ("../../..").
-export const flattenMonorepoContext = async (actorName, absActorDir, contextAbsDir, actorJson, keptContextFiles, repoRoot) => {
+export const flattenMonorepoContext = async (actorName, absActorDir, contextAbsDir, actorJson, keptContextFiles) => {
     console.error(`[${actorName}]: monorepo actor detected — flattening from Docker context`);
     const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), `apify-build-${actorName.replace('/', '_')}-`));
     const filePaths = [];
@@ -88,11 +90,13 @@ export const flattenMonorepoContext = async (actorName, absActorDir, contextAbsD
         await fs.copyFile(absFilePath, destPath);
         filePaths.push(destPath);
     }));
-    // Step 2: overlay the actor's .actor/ directory at the temp dir root. collectNonIgnoredFiles
-    // always keeps .actor/ paths regardless of .gitignore, but still drops the hardcoded secret
-    // patterns — so this isn't a raw copy, a stray secret file living inside .actor/ is still dropped.
+    // Step 2: overlay the actor's own .actor/ directory at the temp dir root. Its files are already
+    // present in keptContextFiles (collectNonIgnoredFiles keeps .actor/ paths unconditionally — see
+    // step 1 above) — pick out this actor's own subset (ignoring any sibling actors' .actor/ folders
+    // that might also appear in the broader context) and hoist each to its position relative to
+    // .actor/ itself, so it lands under tempDir/.actor/ instead of its original nested location.
     const actorMetaDir = path.join(absActorDir, '.actor');
-    const keptActorFiles = collectNonIgnoredFiles(actorMetaDir, repoRoot);
+    const keptActorFiles = keptContextFiles.filter((absFilePath) => isPathWithinScope(absFilePath, actorMetaDir));
     await Promise.all(keptActorFiles.map(async (absFilePath) => {
         const relPath = path.relative(actorMetaDir, absFilePath);
         const destPath = path.join(tempDir, '.actor', relPath);
@@ -142,23 +146,24 @@ export const rewriteActorJsonPaths = async (absActorDir, contextAbsDir, tempDir,
 export const runBuildsFromLocal = async ({ actorConfigs, dryRun, }) => {
     if (dryRun) {
         console.error('[DRY RUN] Would build from local source:');
-        for (const { actorName, folder } of actorConfigs) {
-            console.error(`  ${actorName} (${folder})`);
+        for (const { actorFullName, folder } of actorConfigs) {
+            console.error(`  ${actorFullName} (${folder})`);
         }
-        return actorConfigs.map(({ actorName }) => ({
+        return actorConfigs.map(({ actorFullName }) => ({
             buildId: 'dry-run',
-            actorId: 'dry-run',
+            actorRawId: 'dry-run',
             buildNumber: '0.98.0',
-            actorName,
+            actorFullName,
         }));
     }
     console.error('=========================================');
     console.error('STARTED LOCAL BUILDS:');
-    const startedBuilds = await Promise.all(actorConfigs.map(async ({ actorName, folder }) => {
-        const builder = ApifyBuilder.fromActorName(actorName);
-        const sourceFiles = await collectSourceFiles(actorName, folder);
+    const buildersByActorFullName = new Map(actorConfigs.map((actorConfig) => [actorConfig.actorFullName, ApifyBuilder.fromActorConfig(actorConfig)]));
+    const startedBuilds = await Promise.all(actorConfigs.map(async ({ actorFullName, folder }) => {
+        const builder = buildersByActorFullName.get(actorFullName);
+        const sourceFiles = await collectSourceFiles(actorFullName, folder);
         return builder.startActorBuildFromSourceFiles(sourceFiles);
     }));
-    return waitAndSummarizeBuilds(startedBuilds, 'LOCAL BUILDS');
+    return waitAndSummarizeBuilds(startedBuilds, buildersByActorFullName, 'LOCAL BUILDS');
 };
 //# sourceMappingURL=build-from-local.js.map

package/dist/bin/build-from-local.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-from-local.js","sourceRoot":"","sources":["../../bin/build-from-local.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build-from-local.js","sourceRoot":"","sources":["../../bin/build-from-local.ts"],"names":[],"mappings":"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"}

package/dist/bin/build.d.ts

@@ -4,12 +4,12 @@ type BuildPrActorOptions = {
     buildTag?: string;
     versionNumber: string;
     gitRepoUrl: string;
-    actorName: string;
+    actorConfig: ActorConfig;
     useDockerCache: boolean;
 };
 export declare class ApifyBuilder {
     private readonly apifyClient;
-    private readonly actorName;
+    private readonly actorFullName;
     private constructor();
     getDefaultVersionAndTag: () => Promise<{
         defaultBuildNumber: string;
@@ -18,18 +18,15 @@ export declare class ApifyBuilder {
     }>;
     startActorBuild: ({ buildTag, versionNumber, gitRepoUrl, useDockerCache, }: BuildPrActorOptions) => Promise<BuildData>;
     startActorBuildFromSourceFiles: (sourceFiles: ActorVersionSourceFile[]) => Promise<BuildData>;
-    waitForBuildToFinish: (buildId: string, actorName: string) => Promise<Build>;
-    /**
-     * Create ApifyBuilder with actor owner's token
-     */
-    static fromActorName: (actorName: string) => ApifyBuilder;
+    waitForBuildToFinish: (buildId: string) => Promise<Build>;
+    static fromActorConfig: (actorConfig: ActorConfig) => ApifyBuilder;
     /**
      * Deletes build of all versions. Apify API doesn't allow to delete default build and we explicitly skip it
      * We delete devel builds faster because we used the for every PR until recently so just to get rid of them faster
      */
     deleteOldBuilds(): Promise<void>;
 }
-export declare const waitAndSummarizeBuilds: (startedBuilds: BuildData[], label: string) => Promise<BuildData[]>;
+export declare const waitAndSummarizeBuilds: (startedBuilds: BuildData[], buildersMap: Map<string, ApifyBuilder>, label: string) => Promise<BuildData[]>;
 type RunBuildsOptions = {
     actorConfigs: ActorConfig[];
     isLatest?: boolean;

package/dist/bin/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../bin/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAKlE,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEzD,KAAK,mBAAmB,GAAG;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,OAAO,CAAC;CAC3B,CAAC;AACF,qBAAa,YAAY;IAEjB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAF9B,OAAO;IAMP,uBAAuB,QAAa,OAAO,CAAC;QACxC,kBAAkB,EAAE,MAAM,CAAC;QAC3B,oBAAoB,EAAE,MAAM,CAAC;QAC7B,eAAe,EAAE,MAAM,CAAC;KAC3B,CAAC,CAgCA;IAEF,eAAe,GAAU,0DAKtB,mBAAmB,KAAG,OAAO,CAAC,SAAS,CAAC,CAqCzC;IAEF,8BAA8B,GAAU,aAAa,sBAAsB,EAAE,KAAG,OAAO,CAAC,SAAS,CAAC,CA+BhG;IAEF,oBAAoB,GAAU,SAAS,MAAM,EAAE,WAAW,MAAM,KAAG,OAAO,CAAC,KAAK,CAAC,CAmB/E;IAEF;;OAEG;IACH,MAAM,CAAC,aAAa,GAAI,WAAW,MAAM,KAAG,YAAY,CAetD;IAEF;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAwFzC;AAED,eAAO,MAAM,sBAAsB,GAAU,eAAe,SAAS,EAAE,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,SAAS,EAAE,CAkB3G,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACpB,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,SAAS,GAAU,sEAO7B,gBAAgB,iDAsClB,CAAC;AAEF,eAAO,MAAM,eAAe,GAAU,cAAc,WAAW,EAAE,kBAIhE,CAAC"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../bin/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAKlE,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEzD,KAAK,mBAAmB,GAAG;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;CAC3B,CAAC;AACF,qBAAa,YAAY;IAEjB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAFlC,OAAO;IAMP,uBAAuB,QAAa,OAAO,CAAC;QACxC,kBAAkB,EAAE,MAAM,CAAC;QAC3B,oBAAoB,EAAE,MAAM,CAAC;QAC7B,eAAe,EAAE,MAAM,CAAC;KAC3B,CAAC,CAgCA;IAEF,eAAe,GAAU,0DAKtB,mBAAmB,KAAG,OAAO,CAAC,SAAS,CAAC,CAqCzC;IAEF,8BAA8B,GAAU,aAAa,sBAAsB,EAAE,KAAG,OAAO,CAAC,SAAS,CAAC,CA+BhG;IAEF,oBAAoB,GAAU,SAAS,MAAM,KAAG,OAAO,CAAC,KAAK,CAAC,CAmB5D;IAEF,MAAM,CAAC,eAAe,GAAI,aAAa,WAAW,KAAG,YAAY,CAQ/D;IAEF;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAsFzC;AAED,eAAO,MAAM,sBAAsB,GAC/B,eAAe,SAAS,EAAE,EAC1B,aAAa,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACtC,OAAO,MAAM,KACd,OAAO,CAAC,SAAS,EAAE,CAkBrB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACpB,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,SAAS,GAAU,sEAO7B,gBAAgB,iDA0ClB,CAAC;AAEF,eAAO,MAAM,eAAe,GAAU,cAAc,WAAW,EAAE,kBAIhE,CAAC"}