Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 128 additions & 0 deletions src/lib/packaging/__tests__/helpers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,9 @@ import {
resolveProjectPaths,
resolveProjectPathsSync,
} from '../helpers.js';
import { unzipSync } from 'fflate';
import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'fs';
import { readFile } from 'fs/promises';
import { tmpdir } from 'os';
import { join } from 'path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
Expand DownExpand Up@@ -388,3 +390,129 @@ describe('convertWindowsScriptsToLinux (shebang rewriting on non-Windows)', () =
expect(existsSync(join(staging, 'bin'))).toBe(false);
});
});

// ── Issue #843: nested agentcore directory exclusion ────────────────

describe('nested agentcore directory is preserved (issue #843)', () => {
let root: string;

beforeAll(() => {
root = mkdtempSync(join(tmpdir(), 'helpers-nested-agentcore-'));
});

afterAll(() => {
rmSync(root, { recursive: true, force: true });
});

/**
* Helper: build a source tree that mimics a real project with a
* top-level agentcore/ config dir AND a third-party dependency
* that ships its own agentcore/ sub-module.
*
* <src>/
* main.py
* agentcore/ ← should be excluded (project config dir)
* config.yaml
* lib/
* langgraph_checkpoint_aws/
* __init__.py
* agentcore/ ← should be INCLUDED (dependency sub-module)
* __init__.py
* core.py
*/
function buildFixture(base: string): string {
const src = join(base, 'src');

// Top-level source file
mkdirSync(src, { recursive: true });
writeFileSync(join(src, 'main.py'), 'print("hello")');

// Top-level agentcore/ (project config — should be excluded)
mkdirSync(join(src, 'agentcore'), { recursive: true });
writeFileSync(join(src, 'agentcore', 'config.yaml'), 'key: value');

// Nested dependency with its own agentcore/ sub-module
const nestedAgentcore = join(src, 'lib', 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(nestedAgentcore, { recursive: true });
writeFileSync(join(src, 'lib', 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(nestedAgentcore, '__init__.py'), '# agentcore init');
writeFileSync(join(nestedAgentcore, 'core.py'), 'class Core: pass');

return src;
}

// ── copySourceTree (async) ──

it('excludes top-level agentcore/ but includes nested agentcore/', async () => {
const src = buildFixture(join(root, 'copy-async'));
const dest = join(root, 'copy-async-dest');
mkdirSync(dest, { recursive: true });

await copySourceTree(src, dest);

// Top-level agentcore/ excluded
expect(existsSync(join(dest, 'agentcore'))).toBe(false);

// Source file preserved
expect(existsSync(join(dest, 'main.py'))).toBe(true);

// Nested agentcore/ inside dependency preserved
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', '__init__.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', 'core.py'))).toBe(true);
});

// ── copySourceTreeSync ──

it('sync: excludes top-level agentcore/ but includes nested agentcore/', () => {
const src = buildFixture(join(root, 'copy-sync'));
const dest = join(root, 'copy-sync-dest');
mkdirSync(dest, { recursive: true });

copySourceTreeSync(src, dest);

expect(existsSync(join(dest, 'agentcore'))).toBe(false);
expect(existsSync(join(dest, 'main.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', '__init__.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', 'core.py'))).toBe(true);
});

// ── createZipFromDir (async) ──

it('zip: excludes top-level agentcore/ but includes nested agentcore/', async () => {
const src = buildFixture(join(root, 'zip-async'));
const zipPath = join(root, 'zip-async.zip');

await createZipFromDir(src, zipPath);

const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

// Top-level agentcore/ should NOT appear
expect(entries.some(e => e === 'agentcore/config.yaml')).toBe(false);
expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);

// Nested agentcore/ SHOULD appear
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');

// Regular files present
expect(entries).toContain('main.py');
});

// ── createZipFromDirSync ──

it('sync zip: excludes top-level agentcore/ but includes nested agentcore/', () => {
const src = buildFixture(join(root, 'zip-sync'));
const zipPath = join(root, 'zip-sync.zip');

createZipFromDirSync(src, zipPath);

const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');
expect(entries).toContain('main.py');
});
});
42 changes: 21 additions & 21 deletions src/lib/packaging/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,15 +51,7 @@ interface ResolvedPaths {
artifactsDir: string;
}

const EXCLUDED_ENTRIES = new Set([
'agentcore',
'.git',
'.venv',
'__pycache__',
'.pytest_cache',
'.DS_Store',
'node_modules',
]);
const EXCLUDED_ENTRIES = new Set(['.git', '.venv', '__pycache__', '.pytest_cache', '.DS_Store', 'node_modules']);

export const MAX_ZIP_SIZE_BYTES = 250 * 1024 * 1024;

Expand DownExpand Up@@ -147,7 +139,7 @@ export async function ensureDirClean(dir: string): Promise<void> {
await mkdir(dir, { recursive: true });
}

async function copyEntry(source: string, destination: string): Promise<void> {
async function copyEntry(source: string, destination: string, rootDir: string): Promise<void> {
const stats = await stat(source);
if (stats.isDirectory()) {
await mkdir(destination, { recursive: true });
Expand All@@ -156,7 +148,10 @@ async function copyEntry(source: string, destination: string): Promise<void> {
if (EXCLUDED_ENTRIES.has(entry)) {
continue;
}
await copyEntry(join(source, entry), join(destination, entry));
if (entry === CONFIG_DIR && resolve(source) === resolve(rootDir)) {
continue;
}
await copyEntry(join(source, entry), join(destination, entry), rootDir);
}
return;
}
Expand All@@ -170,7 +165,7 @@ export async function copySourceTree(srcDir: string, destination: string): Promi
if (!(await pathExists(srcDir))) {
throw new MissingProjectFileError(srcDir);
}
await copyEntry(srcDir, destination);
await copyEntry(srcDir, destination, srcDir);
}

export async function ensureBinaryAvailable(binary: string, installHint?: string): Promise<void> {
Expand All@@ -197,23 +192,24 @@ export async function createZipFromDir(sourceDir: string, outputZip: string): Pr
await rm(outputZip, { force: true });
await mkdir(dirname(outputZip), { recursive: true });

const files = await collectFiles(sourceDir);
const files = await collectFiles(sourceDir, sourceDir);
const zipped = zipSync(files);
await writeFile(outputZip, zipped);
}

async function collectFiles(directory: string, basePath = ''): Promise<Zippable> {
async function collectFiles(directory: string, rootDir: string, basePath = ''): Promise<Zippable> {
const result: Zippable = {};
const entries = await readdir(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, await collectFiles(fullPath, zipPath));
Object.assign(result, await collectFiles(fullPath, rootDir, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [await readFile(fullPath), { level: 6 }];
}
Expand DownExpand Up@@ -286,7 +282,7 @@ export function ensureDirCleanSync(dir: string): void {
mkdirSync(dir, { recursive: true });
}

function copyEntrySync(source: string, destination: string): void {
function copyEntrySync(source: string, destination: string, rootDir: string): void {
const stats = statSync(source);
if (stats.isDirectory()) {
mkdirSync(destination, { recursive: true });
Expand All@@ -295,7 +291,10 @@ function copyEntrySync(source: string, destination: string): void {
if (EXCLUDED_ENTRIES.has(entry)) {
continue;
}
copyEntrySync(join(source, entry), join(destination, entry));
if (entry === CONFIG_DIR && resolve(source) === resolve(rootDir)) {
continue;
}
copyEntrySync(join(source, entry), join(destination, entry), rootDir);
}
return;
}
Expand All@@ -307,7 +306,7 @@ export function copySourceTreeSync(srcDir: string, destination: string): void {
if (!pathExistsSync(srcDir)) {
throw new MissingProjectFileError(srcDir);
}
copyEntrySync(srcDir, destination);
copyEntrySync(srcDir, destination, srcDir);
}

export function ensureBinaryAvailableSync(binary: string, installHint?: string): void {
Expand All@@ -326,18 +325,19 @@ export function ensureBinaryAvailableSync(binary: string, installHint?: string):
throw new MissingDependencyError(binary, installHint);
}

function collectFilesSync(directory: string, basePath = ''): Zippable {
function collectFilesSync(directory: string, rootDir: string, basePath = ''): Zippable {
const result: Zippable = {};
const entries = readdirSync(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, collectFilesSync(fullPath, zipPath));
Object.assign(result, collectFilesSync(fullPath, rootDir, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [readFileSync(fullPath), { level: 6 }];
}
Expand All@@ -349,7 +349,7 @@ export function createZipFromDirSync(sourceDir: string, outputZip: string): void
rmSync(outputZip, { force: true });
mkdirSync(dirname(outputZip), { recursive: true });

const files = collectFilesSync(sourceDir);
const files = collectFilesSync(sourceDir, sourceDir);
const zipped = zipSync(files);
writeFileSync(outputZip, zipped);
}
Expand Down
13 changes: 0 additions & 13 deletions src/lib/packaging/types/fflate.d.ts

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix: only exclude root-level agentcore/ directory from packaging artifacts by aidandaly24 · Pull Request #844 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 128 additions & 0 deletions src/lib/packaging/__tests__/helpers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,9 @@ import {
resolveProjectPaths,
resolveProjectPathsSync,
} from '../helpers.js';
import { unzipSync } from 'fflate';
import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'fs';
import { readFile } from 'fs/promises';
import { tmpdir } from 'os';
import { join } from 'path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
Expand DownExpand Up@@ -388,3 +390,129 @@ describe('convertWindowsScriptsToLinux (shebang rewriting on non-Windows)', () =
expect(existsSync(join(staging, 'bin'))).toBe(false);
});
});

// ── Issue #843: nested agentcore directory exclusion ────────────────

describe('nested agentcore directory is preserved (issue #843)', () => {
let root: string;

beforeAll(() => {
root = mkdtempSync(join(tmpdir(), 'helpers-nested-agentcore-'));
});

afterAll(() => {
rmSync(root, { recursive: true, force: true });
});

/**
* Helper: build a source tree that mimics a real project with a
* top-level agentcore/ config dir AND a third-party dependency
* that ships its own agentcore/ sub-module.
*
* <src>/
* main.py
* agentcore/ ← should be excluded (project config dir)
* config.yaml
* lib/
* langgraph_checkpoint_aws/
* __init__.py
* agentcore/ ← should be INCLUDED (dependency sub-module)
* __init__.py
* core.py
*/
function buildFixture(base: string): string {
const src = join(base, 'src');

// Top-level source file
mkdirSync(src, { recursive: true });
writeFileSync(join(src, 'main.py'), 'print("hello")');

// Top-level agentcore/ (project config — should be excluded)
mkdirSync(join(src, 'agentcore'), { recursive: true });
writeFileSync(join(src, 'agentcore', 'config.yaml'), 'key: value');

// Nested dependency with its own agentcore/ sub-module
const nestedAgentcore = join(src, 'lib', 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(nestedAgentcore, { recursive: true });
writeFileSync(join(src, 'lib', 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(nestedAgentcore, '__init__.py'), '# agentcore init');
writeFileSync(join(nestedAgentcore, 'core.py'), 'class Core: pass');

return src;
}

// ── copySourceTree (async) ──

it('excludes top-level agentcore/ but includes nested agentcore/', async () => {
const src = buildFixture(join(root, 'copy-async'));
const dest = join(root, 'copy-async-dest');
mkdirSync(dest, { recursive: true });

await copySourceTree(src, dest);

// Top-level agentcore/ excluded
expect(existsSync(join(dest, 'agentcore'))).toBe(false);

// Source file preserved
expect(existsSync(join(dest, 'main.py'))).toBe(true);

// Nested agentcore/ inside dependency preserved
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', '__init__.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', 'core.py'))).toBe(true);
});

// ── copySourceTreeSync ──

it('sync: excludes top-level agentcore/ but includes nested agentcore/', () => {
const src = buildFixture(join(root, 'copy-sync'));
const dest = join(root, 'copy-sync-dest');
mkdirSync(dest, { recursive: true });

copySourceTreeSync(src, dest);

expect(existsSync(join(dest, 'agentcore'))).toBe(false);
expect(existsSync(join(dest, 'main.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', '__init__.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', 'core.py'))).toBe(true);
});

// ── createZipFromDir (async) ──

it('zip: excludes top-level agentcore/ but includes nested agentcore/', async () => {
const src = buildFixture(join(root, 'zip-async'));
const zipPath = join(root, 'zip-async.zip');

await createZipFromDir(src, zipPath);

const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

// Top-level agentcore/ should NOT appear
expect(entries.some(e => e === 'agentcore/config.yaml')).toBe(false);
expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);

// Nested agentcore/ SHOULD appear
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');

// Regular files present
expect(entries).toContain('main.py');
});

// ── createZipFromDirSync ──

it('sync zip: excludes top-level agentcore/ but includes nested agentcore/', () => {
const src = buildFixture(join(root, 'zip-sync'));
const zipPath = join(root, 'zip-sync.zip');

createZipFromDirSync(src, zipPath);

const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');
expect(entries).toContain('main.py');
});
});
42 changes: 21 additions & 21 deletions src/lib/packaging/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,15 +51,7 @@ interface ResolvedPaths {
artifactsDir: string;
}

const EXCLUDED_ENTRIES = new Set([
'agentcore',
'.git',
'.venv',
'__pycache__',
'.pytest_cache',
'.DS_Store',
'node_modules',
]);
const EXCLUDED_ENTRIES = new Set(['.git', '.venv', '__pycache__', '.pytest_cache', '.DS_Store', 'node_modules']);

export const MAX_ZIP_SIZE_BYTES = 250 * 1024 * 1024;

Expand DownExpand Up@@ -147,7 +139,7 @@ export async function ensureDirClean(dir: string): Promise<void> {
await mkdir(dir, { recursive: true });
}

async function copyEntry(source: string, destination: string): Promise<void> {
async function copyEntry(source: string, destination: string, rootDir: string): Promise<void> {
const stats = await stat(source);
if (stats.isDirectory()) {
await mkdir(destination, { recursive: true });
Expand All@@ -156,7 +148,10 @@ async function copyEntry(source: string, destination: string): Promise<void> {
if (EXCLUDED_ENTRIES.has(entry)) {
continue;
}
await copyEntry(join(source, entry), join(destination, entry));
if (entry === CONFIG_DIR && resolve(source) === resolve(rootDir)) {
continue;
}
await copyEntry(join(source, entry), join(destination, entry), rootDir);
}
return;
}
Expand All@@ -170,7 +165,7 @@ export async function copySourceTree(srcDir: string, destination: string): Promi
if (!(await pathExists(srcDir))) {
throw new MissingProjectFileError(srcDir);
}
await copyEntry(srcDir, destination);
await copyEntry(srcDir, destination, srcDir);
}

export async function ensureBinaryAvailable(binary: string, installHint?: string): Promise<void> {
Expand All@@ -197,23 +192,24 @@ export async function createZipFromDir(sourceDir: string, outputZip: string): Pr
await rm(outputZip, { force: true });
await mkdir(dirname(outputZip), { recursive: true });

const files = await collectFiles(sourceDir);
const files = await collectFiles(sourceDir, sourceDir);
const zipped = zipSync(files);
await writeFile(outputZip, zipped);
}

async function collectFiles(directory: string, basePath = ''): Promise<Zippable> {
async function collectFiles(directory: string, rootDir: string, basePath = ''): Promise<Zippable> {
const result: Zippable = {};
const entries = await readdir(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, await collectFiles(fullPath, zipPath));
Object.assign(result, await collectFiles(fullPath, rootDir, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [await readFile(fullPath), { level: 6 }];
}
Expand DownExpand Up@@ -286,7 +282,7 @@ export function ensureDirCleanSync(dir: string): void {
mkdirSync(dir, { recursive: true });
}

function copyEntrySync(source: string, destination: string): void {
function copyEntrySync(source: string, destination: string, rootDir: string): void {
const stats = statSync(source);
if (stats.isDirectory()) {
mkdirSync(destination, { recursive: true });
Expand All@@ -295,7 +291,10 @@ function copyEntrySync(source: string, destination: string): void {
if (EXCLUDED_ENTRIES.has(entry)) {
continue;
}
copyEntrySync(join(source, entry), join(destination, entry));
if (entry === CONFIG_DIR && resolve(source) === resolve(rootDir)) {
continue;
}
copyEntrySync(join(source, entry), join(destination, entry), rootDir);
}
return;
}
Expand All@@ -307,7 +306,7 @@ export function copySourceTreeSync(srcDir: string, destination: string): void {
if (!pathExistsSync(srcDir)) {
throw new MissingProjectFileError(srcDir);
}
copyEntrySync(srcDir, destination);
copyEntrySync(srcDir, destination, srcDir);
}

export function ensureBinaryAvailableSync(binary: string, installHint?: string): void {
Expand All@@ -326,18 +325,19 @@ export function ensureBinaryAvailableSync(binary: string, installHint?: string):
throw new MissingDependencyError(binary, installHint);
}

function collectFilesSync(directory: string, basePath = ''): Zippable {
function collectFilesSync(directory: string, rootDir: string, basePath = ''): Zippable {
const result: Zippable = {};
const entries = readdirSync(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, collectFilesSync(fullPath, zipPath));
Object.assign(result, collectFilesSync(fullPath, rootDir, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [readFileSync(fullPath), { level: 6 }];
}
Expand All@@ -349,7 +349,7 @@ export function createZipFromDirSync(sourceDir: string, outputZip: string): void
rmSync(outputZip, { force: true });
mkdirSync(dirname(outputZip), { recursive: true });

const files = collectFilesSync(sourceDir);
const files = collectFilesSync(sourceDir, sourceDir);
const zipped = zipSync(files);
writeFileSync(outputZip, zipped);
}
Expand Down
13 changes: 0 additions & 13 deletions src/lib/packaging/types/fflate.d.ts

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: only exclude root-level agentcore/ directory from packaging artifacts by aidandaly24 · Pull Request #844 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 128 additions & 0 deletions src/lib/packaging/__tests__/helpers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,9 @@ import {
resolveProjectPaths,
resolveProjectPathsSync,
} from '../helpers.js';
import { unzipSync } from 'fflate';
import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'fs';
import { readFile } from 'fs/promises';
import { tmpdir } from 'os';
import { join } from 'path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
Expand DownExpand Up@@ -388,3 +390,129 @@ describe('convertWindowsScriptsToLinux (shebang rewriting on non-Windows)', () =
expect(existsSync(join(staging, 'bin'))).toBe(false);
});
});

// ── Issue #843: nested agentcore directory exclusion ────────────────

describe('nested agentcore directory is preserved (issue #843)', () => {
let root: string;

beforeAll(() => {
root = mkdtempSync(join(tmpdir(), 'helpers-nested-agentcore-'));
});

afterAll(() => {
rmSync(root, { recursive: true, force: true });
});

/**
* Helper: build a source tree that mimics a real project with a
* top-level agentcore/ config dir AND a third-party dependency
* that ships its own agentcore/ sub-module.
*
* <src>/
* main.py
* agentcore/ ← should be excluded (project config dir)
* config.yaml
* lib/
* langgraph_checkpoint_aws/
* __init__.py
* agentcore/ ← should be INCLUDED (dependency sub-module)
* __init__.py
* core.py
*/
function buildFixture(base: string): string {
const src = join(base, 'src');

// Top-level source file
mkdirSync(src, { recursive: true });
writeFileSync(join(src, 'main.py'), 'print("hello")');

// Top-level agentcore/ (project config — should be excluded)
mkdirSync(join(src, 'agentcore'), { recursive: true });
writeFileSync(join(src, 'agentcore', 'config.yaml'), 'key: value');

// Nested dependency with its own agentcore/ sub-module
const nestedAgentcore = join(src, 'lib', 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(nestedAgentcore, { recursive: true });
writeFileSync(join(src, 'lib', 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(nestedAgentcore, '__init__.py'), '# agentcore init');
writeFileSync(join(nestedAgentcore, 'core.py'), 'class Core: pass');

return src;
}

// ── copySourceTree (async) ──

it('excludes top-level agentcore/ but includes nested agentcore/', async () => {
const src = buildFixture(join(root, 'copy-async'));
const dest = join(root, 'copy-async-dest');
mkdirSync(dest, { recursive: true });

await copySourceTree(src, dest);

// Top-level agentcore/ excluded
expect(existsSync(join(dest, 'agentcore'))).toBe(false);

// Source file preserved
expect(existsSync(join(dest, 'main.py'))).toBe(true);

// Nested agentcore/ inside dependency preserved
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', '__init__.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', 'core.py'))).toBe(true);
});

// ── copySourceTreeSync ──

it('sync: excludes top-level agentcore/ but includes nested agentcore/', () => {
const src = buildFixture(join(root, 'copy-sync'));
const dest = join(root, 'copy-sync-dest');
mkdirSync(dest, { recursive: true });

copySourceTreeSync(src, dest);

expect(existsSync(join(dest, 'agentcore'))).toBe(false);
expect(existsSync(join(dest, 'main.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', '__init__.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', 'core.py'))).toBe(true);
});

// ── createZipFromDir (async) ──

it('zip: excludes top-level agentcore/ but includes nested agentcore/', async () => {
const src = buildFixture(join(root, 'zip-async'));
const zipPath = join(root, 'zip-async.zip');

await createZipFromDir(src, zipPath);

const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

// Top-level agentcore/ should NOT appear
expect(entries.some(e => e === 'agentcore/config.yaml')).toBe(false);
expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);

// Nested agentcore/ SHOULD appear
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');

// Regular files present
expect(entries).toContain('main.py');
});

// ── createZipFromDirSync ──

it('sync zip: excludes top-level agentcore/ but includes nested agentcore/', () => {
const src = buildFixture(join(root, 'zip-sync'));
const zipPath = join(root, 'zip-sync.zip');

createZipFromDirSync(src, zipPath);

const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');
expect(entries).toContain('main.py');
});
});
42 changes: 21 additions & 21 deletions src/lib/packaging/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,15 +51,7 @@ interface ResolvedPaths {
artifactsDir: string;
}

const EXCLUDED_ENTRIES = new Set([
'agentcore',
'.git',
'.venv',
'__pycache__',
'.pytest_cache',
'.DS_Store',
'node_modules',
]);
const EXCLUDED_ENTRIES = new Set(['.git', '.venv', '__pycache__', '.pytest_cache', '.DS_Store', 'node_modules']);

export const MAX_ZIP_SIZE_BYTES = 250 * 1024 * 1024;

Expand DownExpand Up@@ -147,7 +139,7 @@ export async function ensureDirClean(dir: string): Promise<void> {
await mkdir(dir, { recursive: true });
}

async function copyEntry(source: string, destination: string): Promise<void> {
async function copyEntry(source: string, destination: string, rootDir: string): Promise<void> {
const stats = await stat(source);
if (stats.isDirectory()) {
await mkdir(destination, { recursive: true });
Expand All@@ -156,7 +148,10 @@ async function copyEntry(source: string, destination: string): Promise<void> {
if (EXCLUDED_ENTRIES.has(entry)) {
continue;
}
await copyEntry(join(source, entry), join(destination, entry));
if (entry === CONFIG_DIR && resolve(source) === resolve(rootDir)) {
continue;
}
await copyEntry(join(source, entry), join(destination, entry), rootDir);
}
return;
}
Expand All@@ -170,7 +165,7 @@ export async function copySourceTree(srcDir: string, destination: string): Promi
if (!(await pathExists(srcDir))) {
throw new MissingProjectFileError(srcDir);
}
await copyEntry(srcDir, destination);
await copyEntry(srcDir, destination, srcDir);
}

export async function ensureBinaryAvailable(binary: string, installHint?: string): Promise<void> {
Expand All@@ -197,23 +192,24 @@ export async function createZipFromDir(sourceDir: string, outputZip: string): Pr
await rm(outputZip, { force: true });
await mkdir(dirname(outputZip), { recursive: true });

const files = await collectFiles(sourceDir);
const files = await collectFiles(sourceDir, sourceDir);
const zipped = zipSync(files);
await writeFile(outputZip, zipped);
}

async function collectFiles(directory: string, basePath = ''): Promise<Zippable> {
async function collectFiles(directory: string, rootDir: string, basePath = ''): Promise<Zippable> {
const result: Zippable = {};
const entries = await readdir(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, await collectFiles(fullPath, zipPath));
Object.assign(result, await collectFiles(fullPath, rootDir, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [await readFile(fullPath), { level: 6 }];
}
Expand DownExpand Up@@ -286,7 +282,7 @@ export function ensureDirCleanSync(dir: string): void {
mkdirSync(dir, { recursive: true });
}

function copyEntrySync(source: string, destination: string): void {
function copyEntrySync(source: string, destination: string, rootDir: string): void {
const stats = statSync(source);
if (stats.isDirectory()) {
mkdirSync(destination, { recursive: true });
Expand All@@ -295,7 +291,10 @@ function copyEntrySync(source: string, destination: string): void {
if (EXCLUDED_ENTRIES.has(entry)) {
continue;
}
copyEntrySync(join(source, entry), join(destination, entry));
if (entry === CONFIG_DIR && resolve(source) === resolve(rootDir)) {
continue;
}
copyEntrySync(join(source, entry), join(destination, entry), rootDir);
}
return;
}
Expand All@@ -307,7 +306,7 @@ export function copySourceTreeSync(srcDir: string, destination: string): void {
if (!pathExistsSync(srcDir)) {
throw new MissingProjectFileError(srcDir);
}
copyEntrySync(srcDir, destination);
copyEntrySync(srcDir, destination, srcDir);
}

export function ensureBinaryAvailableSync(binary: string, installHint?: string): void {
Expand All@@ -326,18 +325,19 @@ export function ensureBinaryAvailableSync(binary: string, installHint?: string):
throw new MissingDependencyError(binary, installHint);
}

function collectFilesSync(directory: string, basePath = ''): Zippable {
function collectFilesSync(directory: string, rootDir: string, basePath = ''): Zippable {
const result: Zippable = {};
const entries = readdirSync(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, collectFilesSync(fullPath, zipPath));
Object.assign(result, collectFilesSync(fullPath, rootDir, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [readFileSync(fullPath), { level: 6 }];
}
Expand All@@ -349,7 +349,7 @@ export function createZipFromDirSync(sourceDir: string, outputZip: string): void
rmSync(outputZip, { force: true });
mkdirSync(dirname(outputZip), { recursive: true });

const files = collectFilesSync(sourceDir);
const files = collectFilesSync(sourceDir, sourceDir);
const zipped = zipSync(files);
writeFileSync(outputZip, zipped);
}
Expand Down
13 changes: 0 additions & 13 deletions src/lib/packaging/types/fflate.d.ts

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: only exclude root-level agentcore/ directory from packaging artifacts by aidandaly24 · Pull Request #844 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 128 additions & 0 deletions src/lib/packaging/__tests__/helpers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,9 @@ import {
resolveProjectPaths,
resolveProjectPathsSync,
} from '../helpers.js';
import { unzipSync } from 'fflate';
import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'fs';
import { readFile } from 'fs/promises';
import { tmpdir } from 'os';
import { join } from 'path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
Expand DownExpand Up@@ -388,3 +390,129 @@ describe('convertWindowsScriptsToLinux (shebang rewriting on non-Windows)', () =
expect(existsSync(join(staging, 'bin'))).toBe(false);
});
});

// ── Issue #843: nested agentcore directory exclusion ────────────────

describe('nested agentcore directory is preserved (issue #843)', () => {
let root: string;

beforeAll(() => {
root = mkdtempSync(join(tmpdir(), 'helpers-nested-agentcore-'));
});

afterAll(() => {
rmSync(root, { recursive: true, force: true });
});

/**
* Helper: build a source tree that mimics a real project with a
* top-level agentcore/ config dir AND a third-party dependency
* that ships its own agentcore/ sub-module.
*
* <src>/
* main.py
* agentcore/ ← should be excluded (project config dir)
* config.yaml
* lib/
* langgraph_checkpoint_aws/
* __init__.py
* agentcore/ ← should be INCLUDED (dependency sub-module)
* __init__.py
* core.py
*/
function buildFixture(base: string): string {
const src = join(base, 'src');

// Top-level source file
mkdirSync(src, { recursive: true });
writeFileSync(join(src, 'main.py'), 'print("hello")');

// Top-level agentcore/ (project config — should be excluded)
mkdirSync(join(src, 'agentcore'), { recursive: true });
writeFileSync(join(src, 'agentcore', 'config.yaml'), 'key: value');

// Nested dependency with its own agentcore/ sub-module
const nestedAgentcore = join(src, 'lib', 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(nestedAgentcore, { recursive: true });
writeFileSync(join(src, 'lib', 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(nestedAgentcore, '__init__.py'), '# agentcore init');
writeFileSync(join(nestedAgentcore, 'core.py'), 'class Core: pass');

return src;
}

// ── copySourceTree (async) ──

it('excludes top-level agentcore/ but includes nested agentcore/', async () => {
const src = buildFixture(join(root, 'copy-async'));
const dest = join(root, 'copy-async-dest');
mkdirSync(dest, { recursive: true });

await copySourceTree(src, dest);

// Top-level agentcore/ excluded
expect(existsSync(join(dest, 'agentcore'))).toBe(false);

// Source file preserved
expect(existsSync(join(dest, 'main.py'))).toBe(true);

// Nested agentcore/ inside dependency preserved
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', '__init__.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', 'core.py'))).toBe(true);
});

// ── copySourceTreeSync ──

it('sync: excludes top-level agentcore/ but includes nested agentcore/', () => {
const src = buildFixture(join(root, 'copy-sync'));
const dest = join(root, 'copy-sync-dest');
mkdirSync(dest, { recursive: true });

copySourceTreeSync(src, dest);

expect(existsSync(join(dest, 'agentcore'))).toBe(false);
expect(existsSync(join(dest, 'main.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', '__init__.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', 'core.py'))).toBe(true);
});

// ── createZipFromDir (async) ──

it('zip: excludes top-level agentcore/ but includes nested agentcore/', async () => {
const src = buildFixture(join(root, 'zip-async'));
const zipPath = join(root, 'zip-async.zip');

await createZipFromDir(src, zipPath);

const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

// Top-level agentcore/ should NOT appear
expect(entries.some(e => e === 'agentcore/config.yaml')).toBe(false);
expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);

// Nested agentcore/ SHOULD appear
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');

// Regular files present
expect(entries).toContain('main.py');
});

// ── createZipFromDirSync ──

it('sync zip: excludes top-level agentcore/ but includes nested agentcore/', () => {
const src = buildFixture(join(root, 'zip-sync'));
const zipPath = join(root, 'zip-sync.zip');

createZipFromDirSync(src, zipPath);

const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');
expect(entries).toContain('main.py');
});
});
42 changes: 21 additions & 21 deletions src/lib/packaging/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,15 +51,7 @@ interface ResolvedPaths {
artifactsDir: string;
}

const EXCLUDED_ENTRIES = new Set([
'agentcore',
'.git',
'.venv',
'__pycache__',
'.pytest_cache',
'.DS_Store',
'node_modules',
]);
const EXCLUDED_ENTRIES = new Set(['.git', '.venv', '__pycache__', '.pytest_cache', '.DS_Store', 'node_modules']);

export const MAX_ZIP_SIZE_BYTES = 250 * 1024 * 1024;

Expand DownExpand Up@@ -147,7 +139,7 @@ export async function ensureDirClean(dir: string): Promise<void> {
await mkdir(dir, { recursive: true });
}

async function copyEntry(source: string, destination: string): Promise<void> {
async function copyEntry(source: string, destination: string, rootDir: string): Promise<void> {
const stats = await stat(source);
if (stats.isDirectory()) {
await mkdir(destination, { recursive: true });
Expand All@@ -156,7 +148,10 @@ async function copyEntry(source: string, destination: string): Promise<void> {
if (EXCLUDED_ENTRIES.has(entry)) {
continue;
}
await copyEntry(join(source, entry), join(destination, entry));
if (entry === CONFIG_DIR && resolve(source) === resolve(rootDir)) {
continue;
}
await copyEntry(join(source, entry), join(destination, entry), rootDir);
}
return;
}
Expand All@@ -170,7 +165,7 @@ export async function copySourceTree(srcDir: string, destination: string): Promi
if (!(await pathExists(srcDir))) {
throw new MissingProjectFileError(srcDir);
}
await copyEntry(srcDir, destination);
await copyEntry(srcDir, destination, srcDir);
}

export async function ensureBinaryAvailable(binary: string, installHint?: string): Promise<void> {
Expand All@@ -197,23 +192,24 @@ export async function createZipFromDir(sourceDir: string, outputZip: string): Pr
await rm(outputZip, { force: true });
await mkdir(dirname(outputZip), { recursive: true });

const files = await collectFiles(sourceDir);
const files = await collectFiles(sourceDir, sourceDir);
const zipped = zipSync(files);
await writeFile(outputZip, zipped);
}

async function collectFiles(directory: string, basePath = ''): Promise<Zippable> {
async function collectFiles(directory: string, rootDir: string, basePath = ''): Promise<Zippable> {
const result: Zippable = {};
const entries = await readdir(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, await collectFiles(fullPath, zipPath));
Object.assign(result, await collectFiles(fullPath, rootDir, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [await readFile(fullPath), { level: 6 }];
}
Expand DownExpand Up@@ -286,7 +282,7 @@ export function ensureDirCleanSync(dir: string): void {
mkdirSync(dir, { recursive: true });
}

function copyEntrySync(source: string, destination: string): void {
function copyEntrySync(source: string, destination: string, rootDir: string): void {
const stats = statSync(source);
if (stats.isDirectory()) {
mkdirSync(destination, { recursive: true });
Expand All@@ -295,7 +291,10 @@ function copyEntrySync(source: string, destination: string): void {
if (EXCLUDED_ENTRIES.has(entry)) {
continue;
}
copyEntrySync(join(source, entry), join(destination, entry));
if (entry === CONFIG_DIR && resolve(source) === resolve(rootDir)) {
continue;
}
copyEntrySync(join(source, entry), join(destination, entry), rootDir);
}
return;
}
Expand All@@ -307,7 +306,7 @@ export function copySourceTreeSync(srcDir: string, destination: string): void {
if (!pathExistsSync(srcDir)) {
throw new MissingProjectFileError(srcDir);
}
copyEntrySync(srcDir, destination);
copyEntrySync(srcDir, destination, srcDir);
}

export function ensureBinaryAvailableSync(binary: string, installHint?: string): void {
Expand All@@ -326,18 +325,19 @@ export function ensureBinaryAvailableSync(binary: string, installHint?: string):
throw new MissingDependencyError(binary, installHint);
}

function collectFilesSync(directory: string, basePath = ''): Zippable {
function collectFilesSync(directory: string, rootDir: string, basePath = ''): Zippable {
const result: Zippable = {};
const entries = readdirSync(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, collectFilesSync(fullPath, zipPath));
Object.assign(result, collectFilesSync(fullPath, rootDir, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [readFileSync(fullPath), { level: 6 }];
}
Expand All@@ -349,7 +349,7 @@ export function createZipFromDirSync(sourceDir: string, outputZip: string): void
rmSync(outputZip, { force: true });
mkdirSync(dirname(outputZip), { recursive: true });

const files = collectFilesSync(sourceDir);
const files = collectFilesSync(sourceDir, sourceDir);
const zipped = zipSync(files);
writeFileSync(outputZip, zipped);
}
Expand Down
13 changes: 0 additions & 13 deletions src/lib/packaging/types/fflate.d.ts

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix: only exclude root-level agentcore/ directory from packaging artifacts by aidandaly24 · Pull Request #844 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 128 additions & 0 deletions src/lib/packaging/__tests__/helpers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,9 @@ import {
resolveProjectPaths,
resolveProjectPathsSync,
} from '../helpers.js';
import { unzipSync } from 'fflate';
import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'fs';
import { readFile } from 'fs/promises';
import { tmpdir } from 'os';
import { join } from 'path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
Expand DownExpand Up@@ -388,3 +390,129 @@ describe('convertWindowsScriptsToLinux (shebang rewriting on non-Windows)', () =
expect(existsSync(join(staging, 'bin'))).toBe(false);
});
});

// ── Issue #843: nested agentcore directory exclusion ────────────────

describe('nested agentcore directory is preserved (issue #843)', () => {
let root: string;

beforeAll(() => {
root = mkdtempSync(join(tmpdir(), 'helpers-nested-agentcore-'));
});

afterAll(() => {
rmSync(root, { recursive: true, force: true });
});

/**
* Helper: build a source tree that mimics a real project with a
* top-level agentcore/ config dir AND a third-party dependency
* that ships its own agentcore/ sub-module.
*
* <src>/
* main.py
* agentcore/ ← should be excluded (project config dir)
* config.yaml
* lib/
* langgraph_checkpoint_aws/
* __init__.py
* agentcore/ ← should be INCLUDED (dependency sub-module)
* __init__.py
* core.py
*/
function buildFixture(base: string): string {
const src = join(base, 'src');

// Top-level source file
mkdirSync(src, { recursive: true });
writeFileSync(join(src, 'main.py'), 'print("hello")');

// Top-level agentcore/ (project config — should be excluded)
mkdirSync(join(src, 'agentcore'), { recursive: true });
writeFileSync(join(src, 'agentcore', 'config.yaml'), 'key: value');

// Nested dependency with its own agentcore/ sub-module
const nestedAgentcore = join(src, 'lib', 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(nestedAgentcore, { recursive: true });
writeFileSync(join(src, 'lib', 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(nestedAgentcore, '__init__.py'), '# agentcore init');
writeFileSync(join(nestedAgentcore, 'core.py'), 'class Core: pass');

return src;
}

// ── copySourceTree (async) ──

it('excludes top-level agentcore/ but includes nested agentcore/', async () => {
const src = buildFixture(join(root, 'copy-async'));
const dest = join(root, 'copy-async-dest');
mkdirSync(dest, { recursive: true });

await copySourceTree(src, dest);

// Top-level agentcore/ excluded
expect(existsSync(join(dest, 'agentcore'))).toBe(false);

// Source file preserved
expect(existsSync(join(dest, 'main.py'))).toBe(true);

// Nested agentcore/ inside dependency preserved
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', '__init__.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', 'core.py'))).toBe(true);
});

// ── copySourceTreeSync ──

it('sync: excludes top-level agentcore/ but includes nested agentcore/', () => {
const src = buildFixture(join(root, 'copy-sync'));
const dest = join(root, 'copy-sync-dest');
mkdirSync(dest, { recursive: true });

copySourceTreeSync(src, dest);

expect(existsSync(join(dest, 'agentcore'))).toBe(false);
expect(existsSync(join(dest, 'main.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', '__init__.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', 'core.py'))).toBe(true);
});

// ── createZipFromDir (async) ──

it('zip: excludes top-level agentcore/ but includes nested agentcore/', async () => {
const src = buildFixture(join(root, 'zip-async'));
const zipPath = join(root, 'zip-async.zip');

await createZipFromDir(src, zipPath);

const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

// Top-level agentcore/ should NOT appear
expect(entries.some(e => e === 'agentcore/config.yaml')).toBe(false);
expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);

// Nested agentcore/ SHOULD appear
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');

// Regular files present
expect(entries).toContain('main.py');
});

// ── createZipFromDirSync ──

it('sync zip: excludes top-level agentcore/ but includes nested agentcore/', () => {
const src = buildFixture(join(root, 'zip-sync'));
const zipPath = join(root, 'zip-sync.zip');

createZipFromDirSync(src, zipPath);

const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');
expect(entries).toContain('main.py');
});
});
42 changes: 21 additions & 21 deletions src/lib/packaging/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,15 +51,7 @@ interface ResolvedPaths {
artifactsDir: string;
}

const EXCLUDED_ENTRIES = new Set([
'agentcore',
'.git',
'.venv',
'__pycache__',
'.pytest_cache',
'.DS_Store',
'node_modules',
]);
const EXCLUDED_ENTRIES = new Set(['.git', '.venv', '__pycache__', '.pytest_cache', '.DS_Store', 'node_modules']);

export const MAX_ZIP_SIZE_BYTES = 250 * 1024 * 1024;

Expand DownExpand Up@@ -147,7 +139,7 @@ export async function ensureDirClean(dir: string): Promise<void> {
await mkdir(dir, { recursive: true });
}

async function copyEntry(source: string, destination: string): Promise<void> {
async function copyEntry(source: string, destination: string, rootDir: string): Promise<void> {
const stats = await stat(source);
if (stats.isDirectory()) {
await mkdir(destination, { recursive: true });
Expand All@@ -156,7 +148,10 @@ async function copyEntry(source: string, destination: string): Promise<void> {
if (EXCLUDED_ENTRIES.has(entry)) {
continue;
}
await copyEntry(join(source, entry), join(destination, entry));
if (entry === CONFIG_DIR && resolve(source) === resolve(rootDir)) {
continue;
}
await copyEntry(join(source, entry), join(destination, entry), rootDir);
}
return;
}
Expand All@@ -170,7 +165,7 @@ export async function copySourceTree(srcDir: string, destination: string): Promi
if (!(await pathExists(srcDir))) {
throw new MissingProjectFileError(srcDir);
}
await copyEntry(srcDir, destination);
await copyEntry(srcDir, destination, srcDir);
}

export async function ensureBinaryAvailable(binary: string, installHint?: string): Promise<void> {
Expand All@@ -197,23 +192,24 @@ export async function createZipFromDir(sourceDir: string, outputZip: string): Pr
await rm(outputZip, { force: true });
await mkdir(dirname(outputZip), { recursive: true });

const files = await collectFiles(sourceDir);
const files = await collectFiles(sourceDir, sourceDir);
const zipped = zipSync(files);
await writeFile(outputZip, zipped);
}

async function collectFiles(directory: string, basePath = ''): Promise<Zippable> {
async function collectFiles(directory: string, rootDir: string, basePath = ''): Promise<Zippable> {
const result: Zippable = {};
const entries = await readdir(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, await collectFiles(fullPath, zipPath));
Object.assign(result, await collectFiles(fullPath, rootDir, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [await readFile(fullPath), { level: 6 }];
}
Expand DownExpand Up@@ -286,7 +282,7 @@ export function ensureDirCleanSync(dir: string): void {
mkdirSync(dir, { recursive: true });
}

function copyEntrySync(source: string, destination: string): void {
function copyEntrySync(source: string, destination: string, rootDir: string): void {
const stats = statSync(source);
if (stats.isDirectory()) {
mkdirSync(destination, { recursive: true });
Expand All@@ -295,7 +291,10 @@ function copyEntrySync(source: string, destination: string): void {
if (EXCLUDED_ENTRIES.has(entry)) {
continue;
}
copyEntrySync(join(source, entry), join(destination, entry));
if (entry === CONFIG_DIR && resolve(source) === resolve(rootDir)) {
continue;
}
copyEntrySync(join(source, entry), join(destination, entry), rootDir);
}
return;
}
Expand All@@ -307,7 +306,7 @@ export function copySourceTreeSync(srcDir: string, destination: string): void {
if (!pathExistsSync(srcDir)) {
throw new MissingProjectFileError(srcDir);
}
copyEntrySync(srcDir, destination);
copyEntrySync(srcDir, destination, srcDir);
}

export function ensureBinaryAvailableSync(binary: string, installHint?: string): void {
Expand All@@ -326,18 +325,19 @@ export function ensureBinaryAvailableSync(binary: string, installHint?: string):
throw new MissingDependencyError(binary, installHint);
}

function collectFilesSync(directory: string, basePath = ''): Zippable {
function collectFilesSync(directory: string, rootDir: string, basePath = ''): Zippable {
const result: Zippable = {};
const entries = readdirSync(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, collectFilesSync(fullPath, zipPath));
Object.assign(result, collectFilesSync(fullPath, rootDir, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [readFileSync(fullPath), { level: 6 }];
}
Expand All@@ -349,7 +349,7 @@ export function createZipFromDirSync(sourceDir: string, outputZip: string): void
rmSync(outputZip, { force: true });
mkdirSync(dirname(outputZip), { recursive: true });

const files = collectFilesSync(sourceDir);
const files = collectFilesSync(sourceDir, sourceDir);
const zipped = zipSync(files);
writeFileSync(outputZip, zipped);
}
Expand Down
13 changes: 0 additions & 13 deletions src/lib/packaging/types/fflate.d.ts

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: only exclude root-level agentcore/ directory from packaging artifacts by aidandaly24 · Pull Request #844 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 128 additions & 0 deletions src/lib/packaging/__tests__/helpers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,9 @@ import {
resolveProjectPaths,
resolveProjectPathsSync,
} from '../helpers.js';
import { unzipSync } from 'fflate';
import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'fs';
import { readFile } from 'fs/promises';
import { tmpdir } from 'os';
import { join } from 'path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
Expand DownExpand Up@@ -388,3 +390,129 @@ describe('convertWindowsScriptsToLinux (shebang rewriting on non-Windows)', () =
expect(existsSync(join(staging, 'bin'))).toBe(false);
});
});

// ── Issue #843: nested agentcore directory exclusion ────────────────

describe('nested agentcore directory is preserved (issue #843)', () => {
let root: string;

beforeAll(() => {
root = mkdtempSync(join(tmpdir(), 'helpers-nested-agentcore-'));
});

afterAll(() => {
rmSync(root, { recursive: true, force: true });
});

/**
* Helper: build a source tree that mimics a real project with a
* top-level agentcore/ config dir AND a third-party dependency
* that ships its own agentcore/ sub-module.
*
* <src>/
* main.py
* agentcore/ ← should be excluded (project config dir)
* config.yaml
* lib/
* langgraph_checkpoint_aws/
* __init__.py
* agentcore/ ← should be INCLUDED (dependency sub-module)
* __init__.py
* core.py
*/
function buildFixture(base: string): string {
const src = join(base, 'src');

// Top-level source file
mkdirSync(src, { recursive: true });
writeFileSync(join(src, 'main.py'), 'print("hello")');

// Top-level agentcore/ (project config — should be excluded)
mkdirSync(join(src, 'agentcore'), { recursive: true });
writeFileSync(join(src, 'agentcore', 'config.yaml'), 'key: value');

// Nested dependency with its own agentcore/ sub-module
const nestedAgentcore = join(src, 'lib', 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(nestedAgentcore, { recursive: true });
writeFileSync(join(src, 'lib', 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(nestedAgentcore, '__init__.py'), '# agentcore init');
writeFileSync(join(nestedAgentcore, 'core.py'), 'class Core: pass');

return src;
}

// ── copySourceTree (async) ──

it('excludes top-level agentcore/ but includes nested agentcore/', async () => {
const src = buildFixture(join(root, 'copy-async'));
const dest = join(root, 'copy-async-dest');
mkdirSync(dest, { recursive: true });

await copySourceTree(src, dest);

// Top-level agentcore/ excluded
expect(existsSync(join(dest, 'agentcore'))).toBe(false);

// Source file preserved
expect(existsSync(join(dest, 'main.py'))).toBe(true);

// Nested agentcore/ inside dependency preserved
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', '__init__.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', 'core.py'))).toBe(true);
});

// ── copySourceTreeSync ──

it('sync: excludes top-level agentcore/ but includes nested agentcore/', () => {
const src = buildFixture(join(root, 'copy-sync'));
const dest = join(root, 'copy-sync-dest');
mkdirSync(dest, { recursive: true });

copySourceTreeSync(src, dest);

expect(existsSync(join(dest, 'agentcore'))).toBe(false);
expect(existsSync(join(dest, 'main.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', '__init__.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', 'core.py'))).toBe(true);
});

// ── createZipFromDir (async) ──

it('zip: excludes top-level agentcore/ but includes nested agentcore/', async () => {
const src = buildFixture(join(root, 'zip-async'));
const zipPath = join(root, 'zip-async.zip');

await createZipFromDir(src, zipPath);

const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

// Top-level agentcore/ should NOT appear
expect(entries.some(e => e === 'agentcore/config.yaml')).toBe(false);
expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);

// Nested agentcore/ SHOULD appear
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');

// Regular files present
expect(entries).toContain('main.py');
});

// ── createZipFromDirSync ──

it('sync zip: excludes top-level agentcore/ but includes nested agentcore/', () => {
const src = buildFixture(join(root, 'zip-sync'));
const zipPath = join(root, 'zip-sync.zip');

createZipFromDirSync(src, zipPath);

const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');
expect(entries).toContain('main.py');
});
});
42 changes: 21 additions & 21 deletions src/lib/packaging/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,15 +51,7 @@ interface ResolvedPaths {
artifactsDir: string;
}

const EXCLUDED_ENTRIES = new Set([
'agentcore',
'.git',
'.venv',
'__pycache__',
'.pytest_cache',
'.DS_Store',
'node_modules',
]);
const EXCLUDED_ENTRIES = new Set(['.git', '.venv', '__pycache__', '.pytest_cache', '.DS_Store', 'node_modules']);

export const MAX_ZIP_SIZE_BYTES = 250 * 1024 * 1024;

Expand DownExpand Up@@ -147,7 +139,7 @@ export async function ensureDirClean(dir: string): Promise<void> {
await mkdir(dir, { recursive: true });
}

async function copyEntry(source: string, destination: string): Promise<void> {
async function copyEntry(source: string, destination: string, rootDir: string): Promise<void> {
const stats = await stat(source);
if (stats.isDirectory()) {
await mkdir(destination, { recursive: true });
Expand All@@ -156,7 +148,10 @@ async function copyEntry(source: string, destination: string): Promise<void> {
if (EXCLUDED_ENTRIES.has(entry)) {
continue;
}
await copyEntry(join(source, entry), join(destination, entry));
if (entry === CONFIG_DIR && resolve(source) === resolve(rootDir)) {
continue;
}
await copyEntry(join(source, entry), join(destination, entry), rootDir);
}
return;
}
Expand All@@ -170,7 +165,7 @@ export async function copySourceTree(srcDir: string, destination: string): Promi
if (!(await pathExists(srcDir))) {
throw new MissingProjectFileError(srcDir);
}
await copyEntry(srcDir, destination);
await copyEntry(srcDir, destination, srcDir);
}

export async function ensureBinaryAvailable(binary: string, installHint?: string): Promise<void> {
Expand All@@ -197,23 +192,24 @@ export async function createZipFromDir(sourceDir: string, outputZip: string): Pr
await rm(outputZip, { force: true });
await mkdir(dirname(outputZip), { recursive: true });

const files = await collectFiles(sourceDir);
const files = await collectFiles(sourceDir, sourceDir);
const zipped = zipSync(files);
await writeFile(outputZip, zipped);
}

async function collectFiles(directory: string, basePath = ''): Promise<Zippable> {
async function collectFiles(directory: string, rootDir: string, basePath = ''): Promise<Zippable> {
const result: Zippable = {};
const entries = await readdir(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, await collectFiles(fullPath, zipPath));
Object.assign(result, await collectFiles(fullPath, rootDir, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [await readFile(fullPath), { level: 6 }];
}
Expand DownExpand Up@@ -286,7 +282,7 @@ export function ensureDirCleanSync(dir: string): void {
mkdirSync(dir, { recursive: true });
}

function copyEntrySync(source: string, destination: string): void {
function copyEntrySync(source: string, destination: string, rootDir: string): void {
const stats = statSync(source);
if (stats.isDirectory()) {
mkdirSync(destination, { recursive: true });
Expand All@@ -295,7 +291,10 @@ function copyEntrySync(source: string, destination: string): void {
if (EXCLUDED_ENTRIES.has(entry)) {
continue;
}
copyEntrySync(join(source, entry), join(destination, entry));
if (entry === CONFIG_DIR && resolve(source) === resolve(rootDir)) {
continue;
}
copyEntrySync(join(source, entry), join(destination, entry), rootDir);
}
return;
}
Expand All@@ -307,7 +306,7 @@ export function copySourceTreeSync(srcDir: string, destination: string): void {
if (!pathExistsSync(srcDir)) {
throw new MissingProjectFileError(srcDir);
}
copyEntrySync(srcDir, destination);
copyEntrySync(srcDir, destination, srcDir);
}

export function ensureBinaryAvailableSync(binary: string, installHint?: string): void {
Expand All@@ -326,18 +325,19 @@ export function ensureBinaryAvailableSync(binary: string, installHint?: string):
throw new MissingDependencyError(binary, installHint);
}

function collectFilesSync(directory: string, basePath = ''): Zippable {
function collectFilesSync(directory: string, rootDir: string, basePath = ''): Zippable {
const result: Zippable = {};
const entries = readdirSync(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, collectFilesSync(fullPath, zipPath));
Object.assign(result, collectFilesSync(fullPath, rootDir, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [readFileSync(fullPath), { level: 6 }];
}
Expand All@@ -349,7 +349,7 @@ export function createZipFromDirSync(sourceDir: string, outputZip: string): void
rmSync(outputZip, { force: true });
mkdirSync(dirname(outputZip), { recursive: true });

const files = collectFilesSync(sourceDir);
const files = collectFilesSync(sourceDir, sourceDir);
const zipped = zipSync(files);
writeFileSync(outputZip, zipped);
}
Expand Down
13 changes: 0 additions & 13 deletions src/lib/packaging/types/fflate.d.ts

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: only exclude root-level agentcore/ directory from packaging artifacts by aidandaly24 · Pull Request #844 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 128 additions & 0 deletions src/lib/packaging/__tests__/helpers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,9 @@ import {
resolveProjectPaths,
resolveProjectPathsSync,
} from '../helpers.js';
import { unzipSync } from 'fflate';
import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'fs';
import { readFile } from 'fs/promises';
import { tmpdir } from 'os';
import { join } from 'path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
Expand DownExpand Up@@ -388,3 +390,129 @@ describe('convertWindowsScriptsToLinux (shebang rewriting on non-Windows)', () =
expect(existsSync(join(staging, 'bin'))).toBe(false);
});
});

// ── Issue #843: nested agentcore directory exclusion ────────────────

describe('nested agentcore directory is preserved (issue #843)', () => {
let root: string;

beforeAll(() => {
root = mkdtempSync(join(tmpdir(), 'helpers-nested-agentcore-'));
});

afterAll(() => {
rmSync(root, { recursive: true, force: true });
});

/**
* Helper: build a source tree that mimics a real project with a
* top-level agentcore/ config dir AND a third-party dependency
* that ships its own agentcore/ sub-module.
*
* <src>/
* main.py
* agentcore/ ← should be excluded (project config dir)
* config.yaml
* lib/
* langgraph_checkpoint_aws/
* __init__.py
* agentcore/ ← should be INCLUDED (dependency sub-module)
* __init__.py
* core.py
*/
function buildFixture(base: string): string {
const src = join(base, 'src');

// Top-level source file
mkdirSync(src, { recursive: true });
writeFileSync(join(src, 'main.py'), 'print("hello")');

// Top-level agentcore/ (project config — should be excluded)
mkdirSync(join(src, 'agentcore'), { recursive: true });
writeFileSync(join(src, 'agentcore', 'config.yaml'), 'key: value');

// Nested dependency with its own agentcore/ sub-module
const nestedAgentcore = join(src, 'lib', 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(nestedAgentcore, { recursive: true });
writeFileSync(join(src, 'lib', 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(nestedAgentcore, '__init__.py'), '# agentcore init');
writeFileSync(join(nestedAgentcore, 'core.py'), 'class Core: pass');

return src;
}

// ── copySourceTree (async) ──

it('excludes top-level agentcore/ but includes nested agentcore/', async () => {
const src = buildFixture(join(root, 'copy-async'));
const dest = join(root, 'copy-async-dest');
mkdirSync(dest, { recursive: true });

await copySourceTree(src, dest);

// Top-level agentcore/ excluded
expect(existsSync(join(dest, 'agentcore'))).toBe(false);

// Source file preserved
expect(existsSync(join(dest, 'main.py'))).toBe(true);

// Nested agentcore/ inside dependency preserved
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', '__init__.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', 'core.py'))).toBe(true);
});

// ── copySourceTreeSync ──

it('sync: excludes top-level agentcore/ but includes nested agentcore/', () => {
const src = buildFixture(join(root, 'copy-sync'));
const dest = join(root, 'copy-sync-dest');
mkdirSync(dest, { recursive: true });

copySourceTreeSync(src, dest);

expect(existsSync(join(dest, 'agentcore'))).toBe(false);
expect(existsSync(join(dest, 'main.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', '__init__.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', 'core.py'))).toBe(true);
});

// ── createZipFromDir (async) ──

it('zip: excludes top-level agentcore/ but includes nested agentcore/', async () => {
const src = buildFixture(join(root, 'zip-async'));
const zipPath = join(root, 'zip-async.zip');

await createZipFromDir(src, zipPath);

const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

// Top-level agentcore/ should NOT appear
expect(entries.some(e => e === 'agentcore/config.yaml')).toBe(false);
expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);

// Nested agentcore/ SHOULD appear
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');

// Regular files present
expect(entries).toContain('main.py');
});

// ── createZipFromDirSync ──

it('sync zip: excludes top-level agentcore/ but includes nested agentcore/', () => {
const src = buildFixture(join(root, 'zip-sync'));
const zipPath = join(root, 'zip-sync.zip');

createZipFromDirSync(src, zipPath);

const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');
expect(entries).toContain('main.py');
});
});
42 changes: 21 additions & 21 deletions src/lib/packaging/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,15 +51,7 @@ interface ResolvedPaths {
artifactsDir: string;
}

const EXCLUDED_ENTRIES = new Set([
'agentcore',
'.git',
'.venv',
'__pycache__',
'.pytest_cache',
'.DS_Store',
'node_modules',
]);
const EXCLUDED_ENTRIES = new Set(['.git', '.venv', '__pycache__', '.pytest_cache', '.DS_Store', 'node_modules']);

export const MAX_ZIP_SIZE_BYTES = 250 * 1024 * 1024;

Expand DownExpand Up@@ -147,7 +139,7 @@ export async function ensureDirClean(dir: string): Promise<void> {
await mkdir(dir, { recursive: true });
}

async function copyEntry(source: string, destination: string): Promise<void> {
async function copyEntry(source: string, destination: string, rootDir: string): Promise<void> {
const stats = await stat(source);
if (stats.isDirectory()) {
await mkdir(destination, { recursive: true });
Expand All@@ -156,7 +148,10 @@ async function copyEntry(source: string, destination: string): Promise<void> {
if (EXCLUDED_ENTRIES.has(entry)) {
continue;
}
await copyEntry(join(source, entry), join(destination, entry));
if (entry === CONFIG_DIR && resolve(source) === resolve(rootDir)) {
continue;
}
await copyEntry(join(source, entry), join(destination, entry), rootDir);
}
return;
}
Expand All@@ -170,7 +165,7 @@ export async function copySourceTree(srcDir: string, destination: string): Promi
if (!(await pathExists(srcDir))) {
throw new MissingProjectFileError(srcDir);
}
await copyEntry(srcDir, destination);
await copyEntry(srcDir, destination, srcDir);
}

export async function ensureBinaryAvailable(binary: string, installHint?: string): Promise<void> {
Expand All@@ -197,23 +192,24 @@ export async function createZipFromDir(sourceDir: string, outputZip: string): Pr
await rm(outputZip, { force: true });
await mkdir(dirname(outputZip), { recursive: true });

const files = await collectFiles(sourceDir);
const files = await collectFiles(sourceDir, sourceDir);
const zipped = zipSync(files);
await writeFile(outputZip, zipped);
}

async function collectFiles(directory: string, basePath = ''): Promise<Zippable> {
async function collectFiles(directory: string, rootDir: string, basePath = ''): Promise<Zippable> {
const result: Zippable = {};
const entries = await readdir(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, await collectFiles(fullPath, zipPath));
Object.assign(result, await collectFiles(fullPath, rootDir, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [await readFile(fullPath), { level: 6 }];
}
Expand DownExpand Up@@ -286,7 +282,7 @@ export function ensureDirCleanSync(dir: string): void {
mkdirSync(dir, { recursive: true });
}

function copyEntrySync(source: string, destination: string): void {
function copyEntrySync(source: string, destination: string, rootDir: string): void {
const stats = statSync(source);
if (stats.isDirectory()) {
mkdirSync(destination, { recursive: true });
Expand All@@ -295,7 +291,10 @@ function copyEntrySync(source: string, destination: string): void {
if (EXCLUDED_ENTRIES.has(entry)) {
continue;
}
copyEntrySync(join(source, entry), join(destination, entry));
if (entry === CONFIG_DIR && resolve(source) === resolve(rootDir)) {
continue;
}
copyEntrySync(join(source, entry), join(destination, entry), rootDir);
}
return;
}
Expand All@@ -307,7 +306,7 @@ export function copySourceTreeSync(srcDir: string, destination: string): void {
if (!pathExistsSync(srcDir)) {
throw new MissingProjectFileError(srcDir);
}
copyEntrySync(srcDir, destination);
copyEntrySync(srcDir, destination, srcDir);
}

export function ensureBinaryAvailableSync(binary: string, installHint?: string): void {
Expand All@@ -326,18 +325,19 @@ export function ensureBinaryAvailableSync(binary: string, installHint?: string):
throw new MissingDependencyError(binary, installHint);
}

function collectFilesSync(directory: string, basePath = ''): Zippable {
function collectFilesSync(directory: string, rootDir: string, basePath = ''): Zippable {
const result: Zippable = {};
const entries = readdirSync(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, collectFilesSync(fullPath, zipPath));
Object.assign(result, collectFilesSync(fullPath, rootDir, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [readFileSync(fullPath), { level: 6 }];
}
Expand All@@ -349,7 +349,7 @@ export function createZipFromDirSync(sourceDir: string, outputZip: string): void
rmSync(outputZip, { force: true });
mkdirSync(dirname(outputZip), { recursive: true });

const files = collectFilesSync(sourceDir);
const files = collectFilesSync(sourceDir, sourceDir);
const zipped = zipSync(files);
writeFileSync(outputZip, zipped);
}
Expand Down
13 changes: 0 additions & 13 deletions src/lib/packaging/types/fflate.d.ts

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix: only exclude root-level agentcore/ directory from packaging artifacts by aidandaly24 · Pull Request #844 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 128 additions & 0 deletions src/lib/packaging/__tests__/helpers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,9 @@ import {
resolveProjectPaths,
resolveProjectPathsSync,
} from '../helpers.js';
import { unzipSync } from 'fflate';
import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'fs';
import { readFile } from 'fs/promises';
import { tmpdir } from 'os';
import { join } from 'path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
Expand DownExpand Up@@ -388,3 +390,129 @@ describe('convertWindowsScriptsToLinux (shebang rewriting on non-Windows)', () =
expect(existsSync(join(staging, 'bin'))).toBe(false);
});
});

// ── Issue #843: nested agentcore directory exclusion ────────────────

describe('nested agentcore directory is preserved (issue #843)', () => {
let root: string;

beforeAll(() => {
root = mkdtempSync(join(tmpdir(), 'helpers-nested-agentcore-'));
});

afterAll(() => {
rmSync(root, { recursive: true, force: true });
});

/**
* Helper: build a source tree that mimics a real project with a
* top-level agentcore/ config dir AND a third-party dependency
* that ships its own agentcore/ sub-module.
*
* <src>/
* main.py
* agentcore/ ← should be excluded (project config dir)
* config.yaml
* lib/
* langgraph_checkpoint_aws/
* __init__.py
* agentcore/ ← should be INCLUDED (dependency sub-module)
* __init__.py
* core.py
*/
function buildFixture(base: string): string {
const src = join(base, 'src');

// Top-level source file
mkdirSync(src, { recursive: true });
writeFileSync(join(src, 'main.py'), 'print("hello")');

// Top-level agentcore/ (project config — should be excluded)
mkdirSync(join(src, 'agentcore'), { recursive: true });
writeFileSync(join(src, 'agentcore', 'config.yaml'), 'key: value');

// Nested dependency with its own agentcore/ sub-module
const nestedAgentcore = join(src, 'lib', 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(nestedAgentcore, { recursive: true });
writeFileSync(join(src, 'lib', 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(nestedAgentcore, '__init__.py'), '# agentcore init');
writeFileSync(join(nestedAgentcore, 'core.py'), 'class Core: pass');

return src;
}

// ── copySourceTree (async) ──

it('excludes top-level agentcore/ but includes nested agentcore/', async () => {
const src = buildFixture(join(root, 'copy-async'));
const dest = join(root, 'copy-async-dest');
mkdirSync(dest, { recursive: true });

await copySourceTree(src, dest);

// Top-level agentcore/ excluded
expect(existsSync(join(dest, 'agentcore'))).toBe(false);

// Source file preserved
expect(existsSync(join(dest, 'main.py'))).toBe(true);

// Nested agentcore/ inside dependency preserved
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', '__init__.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', 'core.py'))).toBe(true);
});

// ── copySourceTreeSync ──

it('sync: excludes top-level agentcore/ but includes nested agentcore/', () => {
const src = buildFixture(join(root, 'copy-sync'));
const dest = join(root, 'copy-sync-dest');
mkdirSync(dest, { recursive: true });

copySourceTreeSync(src, dest);

expect(existsSync(join(dest, 'agentcore'))).toBe(false);
expect(existsSync(join(dest, 'main.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', '__init__.py'))).toBe(true);
expect(existsSync(join(dest, 'lib', 'langgraph_checkpoint_aws', 'agentcore', 'core.py'))).toBe(true);
});

// ── createZipFromDir (async) ──

it('zip: excludes top-level agentcore/ but includes nested agentcore/', async () => {
const src = buildFixture(join(root, 'zip-async'));
const zipPath = join(root, 'zip-async.zip');

await createZipFromDir(src, zipPath);

const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

// Top-level agentcore/ should NOT appear
expect(entries.some(e => e === 'agentcore/config.yaml')).toBe(false);
expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);

// Nested agentcore/ SHOULD appear
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');

// Regular files present
expect(entries).toContain('main.py');
});

// ── createZipFromDirSync ──

it('sync zip: excludes top-level agentcore/ but includes nested agentcore/', () => {
const src = buildFixture(join(root, 'zip-sync'));
const zipPath = join(root, 'zip-sync.zip');

createZipFromDirSync(src, zipPath);

const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');
expect(entries).toContain('main.py');
});
});
42 changes: 21 additions & 21 deletions src/lib/packaging/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,15 +51,7 @@ interface ResolvedPaths {
artifactsDir: string;
}

const EXCLUDED_ENTRIES = new Set([
'agentcore',
'.git',
'.venv',
'__pycache__',
'.pytest_cache',
'.DS_Store',
'node_modules',
]);
const EXCLUDED_ENTRIES = new Set(['.git', '.venv', '__pycache__', '.pytest_cache', '.DS_Store', 'node_modules']);

export const MAX_ZIP_SIZE_BYTES = 250 * 1024 * 1024;

Expand DownExpand Up@@ -147,7 +139,7 @@ export async function ensureDirClean(dir: string): Promise<void> {
await mkdir(dir, { recursive: true });
}

async function copyEntry(source: string, destination: string): Promise<void> {
async function copyEntry(source: string, destination: string, rootDir: string): Promise<void> {
const stats = await stat(source);
if (stats.isDirectory()) {
await mkdir(destination, { recursive: true });
Expand All@@ -156,7 +148,10 @@ async function copyEntry(source: string, destination: string): Promise<void> {
if (EXCLUDED_ENTRIES.has(entry)) {
continue;
}
await copyEntry(join(source, entry), join(destination, entry));
if (entry === CONFIG_DIR && resolve(source) === resolve(rootDir)) {
continue;
}
await copyEntry(join(source, entry), join(destination, entry), rootDir);
}
return;
}
Expand All@@ -170,7 +165,7 @@ export async function copySourceTree(srcDir: string, destination: string): Promi
if (!(await pathExists(srcDir))) {
throw new MissingProjectFileError(srcDir);
}
await copyEntry(srcDir, destination);
await copyEntry(srcDir, destination, srcDir);
}

export async function ensureBinaryAvailable(binary: string, installHint?: string): Promise<void> {
Expand All@@ -197,23 +192,24 @@ export async function createZipFromDir(sourceDir: string, outputZip: string): Pr
await rm(outputZip, { force: true });
await mkdir(dirname(outputZip), { recursive: true });

const files = await collectFiles(sourceDir);
const files = await collectFiles(sourceDir, sourceDir);
const zipped = zipSync(files);
await writeFile(outputZip, zipped);
}

async function collectFiles(directory: string, basePath = ''): Promise<Zippable> {
async function collectFiles(directory: string, rootDir: string, basePath = ''): Promise<Zippable> {
const result: Zippable = {};
const entries = await readdir(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, await collectFiles(fullPath, zipPath));
Object.assign(result, await collectFiles(fullPath, rootDir, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [await readFile(fullPath), { level: 6 }];
}
Expand DownExpand Up@@ -286,7 +282,7 @@ export function ensureDirCleanSync(dir: string): void {
mkdirSync(dir, { recursive: true });
}

function copyEntrySync(source: string, destination: string): void {
function copyEntrySync(source: string, destination: string, rootDir: string): void {
const stats = statSync(source);
if (stats.isDirectory()) {
mkdirSync(destination, { recursive: true });
Expand All@@ -295,7 +291,10 @@ function copyEntrySync(source: string, destination: string): void {
if (EXCLUDED_ENTRIES.has(entry)) {
continue;
}
copyEntrySync(join(source, entry), join(destination, entry));
if (entry === CONFIG_DIR && resolve(source) === resolve(rootDir)) {
continue;
}
copyEntrySync(join(source, entry), join(destination, entry), rootDir);
}
return;
}
Expand All@@ -307,7 +306,7 @@ export function copySourceTreeSync(srcDir: string, destination: string): void {
if (!pathExistsSync(srcDir)) {
throw new MissingProjectFileError(srcDir);
}
copyEntrySync(srcDir, destination);
copyEntrySync(srcDir, destination, srcDir);
}

export function ensureBinaryAvailableSync(binary: string, installHint?: string): void {
Expand All@@ -326,18 +325,19 @@ export function ensureBinaryAvailableSync(binary: string, installHint?: string):
throw new MissingDependencyError(binary, installHint);
}

function collectFilesSync(directory: string, basePath = ''): Zippable {
function collectFilesSync(directory: string, rootDir: string, basePath = ''): Zippable {
const result: Zippable = {};
const entries = readdirSync(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, collectFilesSync(fullPath, zipPath));
Object.assign(result, collectFilesSync(fullPath, rootDir, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [readFileSync(fullPath), { level: 6 }];
}
Expand All@@ -349,7 +349,7 @@ export function createZipFromDirSync(sourceDir: string, outputZip: string): void
rmSync(outputZip, { force: true });
mkdirSync(dirname(outputZip), { recursive: true });

const files = collectFilesSync(sourceDir);
const files = collectFilesSync(sourceDir, sourceDir);
const zipped = zipSync(files);
writeFileSync(outputZip, zipped);
}
Expand Down
13 changes: 0 additions & 13 deletions src/lib/packaging/types/fflate.d.ts

This file was deleted.

Loading