ignotum 0.0.17 → 0.0.18

package/dist/cli/bin.mjs

@@ -30914,7 +30914,7 @@ var IdGenerator = class IdGenerator extends Context.Service()("@ignotum/shared/i
 };
 //#endregion
 //#region package.json
-var version$1 = "0.0.17";
+var version$1 = "0.0.18";
 //#endregion
 //#region ../shared/dist/routing/pattern.js
 var RoutingDefinitionError = class extends Schema.TaggedError()("RoutingDefinitionError", {
@@ -31274,6 +31274,12 @@ const generate = Effect.fn("Codegen.generate")(function* (appDirectory) {
 	};
 });
 //#endregion
+//#region src/cli/path.ts
+const PathContainment = { contains(path, directory, child) {
+	const relative = path.relative(directory, child);
+	return relative === "" || !path.isAbsolute(relative) && relative !== ".." && !relative.startsWith(`..${path.sep}`);
+} };
+//#endregion
 //#region src/cli/route-static.ts
 var InvalidRouteSource = class extends Schema.TaggedError()("InvalidRouteSource", {
 	path: Schema.String,
@@ -31346,7 +31352,7 @@ const createRouteExtractor = Effect.fn("Routes.createExtractor")(function* (appD
 			source: ""
 		}, { start: 0 }, "module", detail);
 		const real = yield* fs.realPath(file).pipe(Effect.mapError(() => fail("Cannot read source module.")));
-		if (!real.startsWith(`${appDirectory}/`) || real.startsWith(`${appDirectory}/server/`) || !/\.(ts|tsx)$/.test(real) || real.endsWith(".d.ts")) return yield* fail("Static configuration must come from TypeScript app modules outside server/.");
+		if (!PathContainment.contains(path, appDirectory, real) || PathContainment.contains(path, path.join(appDirectory, "server"), real) || !/\.(ts|tsx)$/.test(real) || real.endsWith(".d.ts")) return yield* fail("Static configuration must come from TypeScript app modules outside server/.");
 		dependencies.add(real);
 		const cached = modules.get(real);
 		if (cached !== void 0) return cached;
@@ -31694,7 +31700,7 @@ const discoverClientRoutes = Effect.fn("Routes.discoverClientRoutes")(function*
 	const seen = /* @__PURE__ */ new Set();
 	const visit = Effect.fn("Routes.visitDirectory")(function* (directory) {
 		const real = yield* fs.realPath(directory).pipe(Effect.mapError(() => diagnostic(directory, "Cannot read route directory.")));
-		if (real !== clientDirectory && !real.startsWith(`${clientDirectory}/`)) return yield* diagnostic(directory, "Route trees cannot escape client/ through symlinks.");
+		if (!PathContainment.contains(path, clientDirectory, real)) return yield* diagnostic(directory, "Route trees cannot escape client/ through symlinks.");
 		if (seen.has(real)) return yield* diagnostic(directory, "Repeated or cyclic route directory.");
 		seen.add(real);
 		const entries = yield* fs.readDirectory(directory).pipe(Effect.mapError(() => diagnostic(directory, "Cannot read route directory.")));
@@ -48025,7 +48031,7 @@ const dev = Command.make("dev", {
 	})));
 })).pipe(Command.withDescription("Run the local Ignotum development server."), Command.withSubcommands([devDatabase]));
 const deploy = Command.make("deploy", {
-	resume: Flag.boolean("resume").pipe(Flag.withDescription("Resume the saved upload or activation.")),
+	resume: Flag.boolean("resume").pipe(Flag.withDescription("Resume the saved upload or activation."), Flag.withDefault(false)),
 	app: Flag.string("app").pipe(Flag.withDescription("Create or link this app slug on the first deploy."), Flag.withSchema(AppSlug), Flag.optional)
 }, Effect.fn("deploy")(function* ({ app, resume }) {
 	const path = yield* Path$1.Path;