Skip to content

Commit a6c569c

Browse files
builder-factorybuilderio-botsteve8708
authored
Core: fix Windows eject dry runs (#9145)
* Fix Windows eject dry runs and reject unsafe manifest paths * Implement factory babysit PR 9145 fix in assigned isolated version, do n * Continue your implementation in version v8rrkgj7. Independent review fou * In version v8rrkgj7, factory proof for bebc251 fails because later par * Factory babysit PR 9145 round 2. Work in your isolated version vc4u020q, * Continue isolated version vc4u020q. Review found 281e266's `if (!wildcar * Factory babysit PR 9145 round br_9145_2, work ONLY in isolated version v * fix-9145-lint: pending changes --------- Co-authored-by: Builder.io <builder-bot@builder.io> Co-authored-by: Steve Sewell <steve@builder.io>
1 parent e0eaf3f commit a6c569c

10 files changed

Lines changed: 742 additions & 11 deletions
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@agent-native/core": patch
3+
---
4+
5+
Fix source-copy eject dry runs on Windows while rejecting unsafe manifest paths.
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
import fs from "node:fs";
2+
import os from "node:os";
3+
import path from "node:path";
4+
5+
import { afterEach } from "vitest";
6+
7+
import type { AgentNativeEjectManifest } from "../../package-lifecycle/eject-manifest.js";
8+
import type { EjectIO, LoadedEjectManifest } from "../eject.js";
9+
10+
const tempDirs: string[] = [];
11+
12+
afterEach(() => {
13+
for (const directory of tempDirs.splice(0)) {
14+
fs.rmSync(directory, { recursive: true, force: true });
15+
}
16+
});
17+
18+
export function fixture() {
19+
const root = fs.mkdtempSync(path.join(os.tmpdir(), "eject-exact-test-"));
20+
tempDirs.push(root);
21+
fs.mkdirSync(path.join(root, "app"), { recursive: true });
22+
fs.writeFileSync(
23+
path.join(root, "package.json"),
24+
JSON.stringify({ name: "example-app", dependencies: {} }),
25+
);
26+
const packageDir = path.join(root, "fixture-toolkit");
27+
fs.mkdirSync(path.join(packageDir, "src", "chat-history"), {
28+
recursive: true,
29+
});
30+
fs.writeFileSync(
31+
path.join(packageDir, "src", "chat-history", "index.ts"),
32+
'export { cn } from "../utils.js";\n',
33+
);
34+
fs.writeFileSync(
35+
path.join(packageDir, "src", "utils.ts"),
36+
"export const cn = (...values: string[]) => values.join(' ');\n",
37+
);
38+
fs.writeFileSync(
39+
path.join(packageDir, "package.json"),
40+
JSON.stringify({ name: "@agent-native/toolkit", version: "1.2.3" }),
41+
);
42+
const manifest: AgentNativeEjectManifest = {
43+
manifestVersion: 1,
44+
package: "@agent-native/toolkit",
45+
catalogs: ["toolkit-ui"],
46+
units: [
47+
{
48+
id: "toolkit/chat-history",
49+
label: "Chat history",
50+
catalog: "toolkit-ui",
51+
catalogItems: ["chat-history"],
52+
entrypoints: ["./chat-history*"],
53+
strategy: "source-copy",
54+
sourceEntries: ["src/chat-history"],
55+
targetRoot: "app/ejected/toolkit",
56+
},
57+
],
58+
};
59+
const loaded: LoadedEjectManifest = {
60+
manifest,
61+
manifestDigest: "manifest-sha256",
62+
packageDir,
63+
packageVersion: "1.2.3",
64+
};
65+
return { root, loaded };
66+
}
67+
68+
export function capture() {
69+
let out = "";
70+
let err = "";
71+
const io: EjectIO = {
72+
out(message) {
73+
out += `${message}\n`;
74+
},
75+
err(message) {
76+
err += `${message}\n`;
77+
},
78+
};
79+
return {
80+
io,
81+
get out() {
82+
return out;
83+
},
84+
get err() {
85+
return err;
86+
},
87+
};
88+
}
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
import fs from "node:fs";
2+
import path from "node:path";
3+
4+
import { describe, expect, it } from "vitest";
5+
6+
import { assertAgentNativeEjectManifest } from "../package-lifecycle/eject-manifest.js";
7+
import { capture, fixture } from "./__tests__/eject-wildcard-fixture.js";
8+
import { runEject } from "./eject.js";
9+
10+
describe("feature eject CLI empty wildcards", () => {
11+
it.each([
12+
["./chat-history*", "./chat-history"],
13+
["./chat-history", "./chat-history*"],
14+
])(
15+
"rewrites an exact import regardless of entrypoint order %s",
16+
async (...entrypoints) => {
17+
const { root, loaded } = fixture();
18+
loaded.manifest.units[0].entrypoints = entrypoints;
19+
expect(() =>
20+
assertAgentNativeEjectManifest(loaded.manifest),
21+
).not.toThrow();
22+
const consumer = path.join(root, "app", "page.tsx");
23+
fs.writeFileSync(
24+
consumer,
25+
'import "@agent-native/toolkit/chat-history";\n',
26+
);
27+
const output = capture();
28+
const result = await runEject(["toolkit/chat-history", "--apply"], {
29+
cwd: root,
30+
io: output.io,
31+
loadManifests: async () => [loaded],
32+
});
33+
expect({ result, error: output.err }).toEqual({ result: 0, error: "" });
34+
expect(fs.readFileSync(consumer, "utf8")).toBe(
35+
'import "./ejected/toolkit/chat-history";\n',
36+
);
37+
expect(
38+
fs.existsSync(
39+
path.join(root, "app/ejected/toolkit/chat-history/index.ts"),
40+
),
41+
).toBe(true);
42+
},
43+
);
44+
45+
it("leaves an empty wildcard capture unmatched when there is no exact entrypoint", async () => {
46+
const { root, loaded } = fixture();
47+
const consumer = path.join(root, "app", "page.tsx");
48+
const original = 'import "@agent-native/toolkit/chat-history";\n';
49+
fs.writeFileSync(consumer, original);
50+
const output = capture();
51+
const result = await runEject(["toolkit/chat-history", "--apply"], {
52+
cwd: root,
53+
io: output.io,
54+
loadManifests: async () => [loaded],
55+
});
56+
expect({ result, error: output.err }).toEqual({ result: 0, error: "" });
57+
expect(fs.readFileSync(consumer, "utf8")).toBe(original);
58+
});
59+
});
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
import fs from "node:fs";
2+
import path from "node:path";
3+
4+
import { expect, it } from "vitest";
5+
6+
import { assertAgentNativeEjectManifest } from "../package-lifecycle/eject-manifest.js";
7+
import { capture, fixture } from "./__tests__/eject-wildcard-fixture.js";
8+
import { runEject } from "./eject.js";
9+
10+
it.each([
11+
["./chat-history*", "./chat-history/C:outside"],
12+
["./chat-history/C:outside", "./chat-history*"],
13+
])(
14+
"prefers an exact entrypoint over a nonempty wildcard in order %s",
15+
async (...entrypoints) => {
16+
const { root, loaded } = fixture();
17+
loaded.manifest.units[0].entrypoints = entrypoints;
18+
loaded.manifest.units[0].sourceEntries = [
19+
"src/exact.ts",
20+
"src/chat-history",
21+
];
22+
fs.writeFileSync(
23+
path.join(loaded.packageDir, "src/exact.ts"),
24+
"export const exact = 1;\n",
25+
);
26+
expect(() => assertAgentNativeEjectManifest(loaded.manifest)).not.toThrow();
27+
const consumer = path.join(root, "app", "page.tsx");
28+
fs.writeFileSync(
29+
consumer,
30+
'import "@agent-native/toolkit/chat-history/C:outside";\n',
31+
);
32+
const output = capture();
33+
const result = await runEject(["toolkit/chat-history", "--apply"], {
34+
cwd: root,
35+
io: output.io,
36+
loadManifests: async () => [loaded],
37+
});
38+
expect({ result, error: output.err }).toEqual({ result: 0, error: "" });
39+
expect(fs.readFileSync(consumer, "utf8")).toBe(
40+
'import "./ejected/toolkit/exact";\n',
41+
);
42+
expect(
43+
fs.readFileSync(path.join(root, "app/ejected/toolkit/exact.ts"), "utf8"),
44+
).toBe("export const exact = 1;\n");
45+
},
46+
);
Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
import fs from "node:fs";
2+
import os from "node:os";
3+
import path from "node:path";
4+
5+
import { afterEach, describe, expect, it } from "vitest";
6+
7+
import type { AgentNativeEjectManifest } from "../package-lifecycle/eject-manifest.js";
8+
import { runEject, type EjectIO, type LoadedEjectManifest } from "./eject.js";
9+
10+
const tempDirs: string[] = [];
11+
12+
afterEach(() => {
13+
for (const directory of tempDirs.splice(0)) {
14+
fs.rmSync(directory, { recursive: true, force: true });
15+
}
16+
});
17+
18+
function fixture() {
19+
const root = fs.mkdtempSync(path.join(os.tmpdir(), "eject-test-"));
20+
tempDirs.push(root);
21+
fs.mkdirSync(path.join(root, "app"), { recursive: true });
22+
fs.writeFileSync(
23+
path.join(root, "package.json"),
24+
`${JSON.stringify({ name: "example-app", dependencies: {} }, null, 2)}\n`,
25+
);
26+
fs.writeFileSync(
27+
path.join(root, "app", "page.tsx"),
28+
[
29+
'import { ChatHistoryList } from "@agent-native/toolkit/chat-history";',
30+
'import "@agent-native/toolkit/chat-history.css";',
31+
'const runtimeValue = "@agent-native/toolkit/chat-history";',
32+
"export { ChatHistoryList };",
33+
"",
34+
].join("\n"),
35+
);
36+
37+
const packageDir = path.join(root, "fixture-toolkit");
38+
fs.mkdirSync(path.join(packageDir, "src", "chat-history"), {
39+
recursive: true,
40+
});
41+
fs.writeFileSync(
42+
path.join(packageDir, "src", "chat-history", "index.ts"),
43+
'export { ChatHistoryList } from "./ChatHistoryList.js";\n',
44+
);
45+
fs.writeFileSync(
46+
path.join(packageDir, "src", "chat-history", "ChatHistoryList.tsx"),
47+
'import { cn } from "../utils.js";\nexport const ChatHistoryList = () => cn("chat");\n',
48+
);
49+
fs.writeFileSync(
50+
path.join(packageDir, "src", "chat-history", "ignored.spec.tsx"),
51+
"throw new Error('do not copy');\n",
52+
);
53+
fs.writeFileSync(
54+
path.join(packageDir, "src", "utils.ts"),
55+
"export const cn = (...values: string[]) => values.join(' ');\n",
56+
);
57+
fs.writeFileSync(
58+
path.join(packageDir, "src", "chat-history.css"),
59+
'@import "./chat-history/theme.css";\n.chat { color: red; }\n',
60+
);
61+
fs.writeFileSync(
62+
path.join(packageDir, "src", "chat-history", "theme.css"),
63+
".theme { color: blue; }\n",
64+
);
65+
fs.writeFileSync(
66+
path.join(packageDir, "package.json"),
67+
`${JSON.stringify(
68+
{
69+
name: "@agent-native/toolkit",
70+
version: "1.2.3",
71+
dependencies: { clsx: "^2.1.0" },
72+
},
73+
null,
74+
2,
75+
)}\n`,
76+
);
77+
const manifest: AgentNativeEjectManifest = {
78+
manifestVersion: 1,
79+
package: "@agent-native/toolkit",
80+
catalogs: ["toolkit-ui"],
81+
units: [
82+
{
83+
id: "toolkit/chat-history",
84+
label: "Chat history",
85+
catalog: "toolkit-ui",
86+
catalogItems: ["./chat-history", "./chat-history/*"],
87+
entrypoints: ["./chat-history", "./chat-history/*"],
88+
strategy: "source-copy",
89+
sourceEntries: ["src/chat-history"],
90+
targetRoot: "app/ejected/toolkit",
91+
styles: [
92+
{
93+
entrypoint: "./chat-history.css",
94+
source: "src/chat-history.css",
95+
},
96+
],
97+
protectedImports: ["@agent-native/core/runtime"],
98+
verification: ["pnpm typecheck"],
99+
},
100+
],
101+
};
102+
const loaded: LoadedEjectManifest = {
103+
manifest,
104+
manifestDigest: "manifest-sha256",
105+
packageDir,
106+
packageVersion: "1.2.3",
107+
};
108+
return { root, loaded };
109+
}
110+
111+
function capture() {
112+
let out = "";
113+
let err = "";
114+
const io: EjectIO = {
115+
out(message) {
116+
out += `${message}\n`;
117+
},
118+
err(message) {
119+
err += `${message}\n`;
120+
},
121+
};
122+
return {
123+
io,
124+
get out() {
125+
return out;
126+
},
127+
get err() {
128+
return err;
129+
},
130+
};
131+
}
132+
133+
describe("feature eject CLI wildcard traversal", () => {
134+
it.each([
135+
"../utils",
136+
"nested/../utils",
137+
"/outside",
138+
"..\\outside",
139+
"C:outside",
140+
"C:/outside",
141+
".",
142+
"nested//file",
143+
])("rejects unsafe wildcard import %s before applying", async (wildcard) => {
144+
const { root, loaded } = fixture();
145+
const consumer = path.join(root, "app", "page.tsx");
146+
const original = `import "@agent-native/toolkit/chat-history/${wildcard}";\n`;
147+
fs.writeFileSync(consumer, original);
148+
const output = capture();
149+
const result = await runEject(["toolkit/chat-history", "--apply"], {
150+
cwd: root,
151+
io: output.io,
152+
loadManifests: async () => [loaded],
153+
});
154+
expect(fs.readFileSync(consumer, "utf8")).toBe(original);
155+
expect(result).toBe(1);
156+
expect(output.err).toContain("Unsafe wildcard");
157+
expect(fs.existsSync(path.join(root, "app/ejected/toolkit"))).toBe(false);
158+
expect(fs.existsSync(path.join(root, "agent-native.ejections.json"))).toBe(
159+
false,
160+
);
161+
});
162+
163+
it("rewrites safe nested wildcard imports into the ejected unit", async () => {
164+
const { root, loaded } = fixture();
165+
const source = path.join(loaded.packageDir, "src/chat-history/nested");
166+
fs.mkdirSync(source, { recursive: true });
167+
fs.writeFileSync(path.join(source, "item.ts"), "export const item = 1;\n");
168+
const consumer = path.join(root, "app", "page.tsx");
169+
fs.writeFileSync(
170+
consumer,
171+
'import { item } from "@agent-native/toolkit/chat-history/nested/item";\n',
172+
);
173+
const output = capture();
174+
expect(
175+
await runEject(["toolkit/chat-history", "--apply"], {
176+
cwd: root,
177+
io: output.io,
178+
loadManifests: async () => [loaded],
179+
}),
180+
).toBe(0);
181+
expect(fs.readFileSync(consumer, "utf8")).toBe(
182+
'import { item } from "./ejected/toolkit/chat-history/nested/item";\n',
183+
);
184+
expect(
185+
fs.readFileSync(
186+
path.join(root, "app/ejected/toolkit/chat-history/nested/item.ts"),
187+
"utf8",
188+
),
189+
).toBe("export const item = 1;\n");
190+
});
191+
});

0 commit comments

Comments
 (0)