ignotum 0.0.17 → 0.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ignotum",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "Ignotum is an opinionated TypeScript application cloud.",
   "author": "Johannes Schießl",
   "repository": {
@@ -112,8 +112,8 @@
     "redis": "6.2.1",
     "@ignotum/contracts": "1.0.0",
     "@ignotum/platform": "1.0.0",
-    "@ignotum/shared": "1.0.0",
     "@ignotum/runtime": "1.0.0",
+    "@ignotum/shared": "1.0.0",
     "@ignotum/versions": "1.0.0"
   },
   "engines": {

package/src/cli/command.ts

@@ -146,6 +146,7 @@ const deploy = Command.make(
   {
     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."),

package/src/cli/path.ts

@@ -0,0 +1,11 @@
+import type { Path } from "effect";
+
+export const PathContainment = {
+  contains(path: Path.Path, directory: string, child: string): boolean {
+    const relative = path.relative(directory, child);
+    return (
+      relative === "" ||
+      (!path.isAbsolute(relative) && relative !== ".." && !relative.startsWith(`..${path.sep}`))
+    );
+  },
+};

package/src/cli/route-codegen.ts

@@ -15,6 +15,7 @@ import {
   writeOutput,
 } from "./codegen.js";
 import { createRouteExtractor, InvalidRouteSource, sourceError } from "./route-static.js";
+import { PathContainment } from "./path.js";
 
 export interface DiscoveredClientModule {
   readonly path: string;
@@ -54,7 +55,7 @@ export const discoverClientRoutes = Effect.fn("Routes.discoverClientRoutes")(fun
     const real = yield* fs
       .realPath(directory)
       .pipe(Effect.mapError(() => diagnostic(directory, "Cannot read route directory.")));
-    if (real !== clientDirectory && !real.startsWith(`${clientDirectory}/`))
+    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);

package/src/cli/route-static.ts

@@ -5,6 +5,7 @@ import {
   StaticMetadata,
   UrlValueDescriptor,
 } from "@ignotum/contracts/app-definition";
+import { PathContainment } from "./path.js";
 
 export class InvalidRouteSource extends Schema.TaggedError<InvalidRouteSource>()(
   "InvalidRouteSource",
@@ -126,8 +127,8 @@ export const createRouteExtractor = Effect.fn("Routes.createExtractor")(function
       .realPath(file)
       .pipe(Effect.mapError(() => fail("Cannot read source module.")));
     if (
-      !real.startsWith(`${appDirectory}/`) ||
-      real.startsWith(`${appDirectory}/server/`) ||
+      !PathContainment.contains(path, appDirectory, real) ||
+      PathContainment.contains(path, path.join(appDirectory, "server"), real) ||
       !/\.(ts|tsx)$/.test(real) ||
       real.endsWith(".d.ts")
     )