@gtkx/cli 1.6.0 → 2.0.0-beta.2

package/src/codegen/run-codegen.ts

@@ -1,29 +1,20 @@
 import { runCodegen as runCodegenCore } from "@gtkx/codegen";
-import {
-    getShadowingStorePaths,
-    LIBRARIES_WILDCARD,
-    redundantLibraries,
-    sweepProjectStaging,
-} from "@gtkx/codegen/internal";
+import { getShadowingStorePaths, sweepProjectStaging } from "@gtkx/codegen/internal";
 import { type Config, loadConfig } from "@gtkx/config";
 import {
     isAgentRulesEnabled,
-    type ResolvedFuture,
     resolveElementComponents,
     resolveElementProps,
-    resolveFuture,
     resolveLazyElements,
     resolveOmittedProps,
-    unknownFutureKeys,
 } from "@gtkx/config/internal";
-import { info, warn } from "@gtkx/utils";
+import { info } from "@gtkx/utils";
 import { existsSync, rmSync } from "node:fs";
 import { join, resolve } from "node:path";
 import { resolveCatalogProject, synchronizeCatalogs } from "../i18n/catalogs.js";
 import { extractSourceCatalog } from "../i18n/source-messages.js";
-import { emitI18nTypes } from "../i18n/types.js";
+import { clearI18nTypes, emitI18nTypes } from "../i18n/types.js";
 import { upsertAgentRules } from "../internal/agent-rules.js";
-import { resolveDataDir } from "../internal/data-dir.js";
 import { discoverSourceFiles } from "../internal/source-imports.js";
 import { emitSchemaEnv } from "../settings/schema.js";
 import { type CodegenInputs, isCodegenStale, resolveCodegenInputs } from "./freshness.js";
@@ -33,6 +24,7 @@ import { type CodegenContext, type CodegenStore, resolveCodegenContext } from ".
 type RunCodegenOptions = {
     cwd?: string;
     mode?: string | undefined;
+    configFile?: string | undefined;
     isForced?: boolean;
     inputs?: CodegenInputs;
     resolved?: LoadedConfig;
@@ -48,12 +40,10 @@ type RunCodegenResult = {
     isRegenerated: boolean;
     namespaces: number;
     intrinsicElements: number;
-    notices: string[];
     duration: number;
-    girPath?: string[] | undefined;
-    configFile?: string | undefined;
-    libraries?: string[] | undefined;
-    future?: string[] | undefined;
+    girPath: string[];
+    configFile: string;
+    libraries: string[];
     reference?: ReferenceResult | undefined;
 };
 
@@ -62,7 +52,6 @@ type CodegenOptionsInput = {
     libraries: string[];
     girPath: string[];
     elements: Config["elements"];
-    future: ResolvedFuture;
 };
 
 type PreparedCodegen = CodegenInputs & { isForced: boolean };
@@ -70,17 +59,10 @@ type PreparedCodegen = CodegenInputs & { isForced: boolean };
 type EnsureGeneratedOptions = {
     shouldAnnounce?: boolean;
     mode?: string;
+    configFile?: string | undefined;
     shouldPreserveI18nMetadata?: boolean | undefined;
 };
 
-type RunOptionsInput = {
-    root: string;
-    mode: string | undefined;
-    inputs: CodegenInputs | null;
-    resolved: LoadedConfig;
-    shouldPreserveI18nMetadata: boolean | undefined;
-};
-
 const GIR_PATH_MISSING_MESSAGE =
     "No GIR search paths available. Install gobject-introspection " +
     "(Linux: `sudo dnf install gobject-introspection-devel` or `sudo apt install libgirepository1.0-dev`), " +
@@ -97,14 +79,9 @@ const removeShadowingStores = (cwd: string): void => {
     removeStores(getShadowingStorePaths(cwd));
 };
 
-const codegenOptions = ({ store, libraries, girPath, elements, future }: CodegenOptionsInput) => ({
+const codegenOptions = ({ store, libraries, girPath, elements }: CodegenOptionsInput) => ({
     libraries,
     girPath,
-    isByteArrayTyped: future.isByteArrayTyped,
-    isValueUnwrapped: future.isValueUnwrapped,
-    isFinishTrimmed: future.isFinishTrimmed,
-    isInoutInPlace: future.isInoutInPlace,
-    isTreeShaken: future.isTreeShaken,
     gi: {
         storeDir: store.giStoreDir,
         linkDir: store.giLinkDir,
@@ -118,93 +95,30 @@ const codegenOptions = ({ store, libraries, girPath, elements, future }: Codegen
                     linkDir: store.jsxLinkDir,
                     version: store.react.version,
                 },
-    reactSubexports: store.react?.subexports ?? [],
     userComponents: resolveElementComponents(elements),
     userProps: resolveElementProps(elements),
     userLazyElements: resolveLazyElements(elements),
     userOmittedProps: resolveOmittedProps(elements),
 });
 
-const enabledFutureFlags = (config: Config): string[] => {
-    const unknown: Set<string> = new Set(unknownFutureKeys(config.future));
-
-    return Object.entries(config.future ?? {})
-        .filter(([name, value]) => value === true && !unknown.has(name))
-        .map(([name]) => name);
-};
-
-const disabledCodegenResult = (configFile: string, notices: string[]): RunCodegenResult => ({
+const disabledCodegenResult = (configFile: string): RunCodegenResult => ({
     isRegenerated: false,
     namespaces: 0,
     intrinsicElements: 0,
-    notices,
     duration: 0,
     girPath: [],
     configFile,
     libraries: [],
 });
 
-const warnNotices = (notices: string[]): void => {
-    for (const notice of notices) {
-        warn(notice);
-    }
-};
-
-const unknownFutureNotice = (keys: string[]): string[] => {
-    if (keys.length === 0) {
-        return [];
-    }
-
-    return [
-        `gtkx.config.ts: \`future\` has no ${keys.join(", ")} flag, so the key is ignored. Check it against ` +
-        "the flags the configuration guide lists.",
-    ];
-};
-
-const redundantLibraryNotice = (entries: string[]): string[] => {
-    if (entries.length === 0) {
-        return [];
-    }
-
-    return [
-        `gtkx.config.ts: \`future.v2DefaultLibraries\` binds ${entries.join(", ")} on its own, so naming them ` +
-        "in `libraries` changes nothing. Drop them; naming them becomes a configuration error in GTKX 2.0.",
-    ];
-};
-
-const wildcardLibrariesNotice = (libraries: Config["libraries"]): string[] => {
-    if (libraries !== LIBRARIES_WILDCARD) {
-        return [];
-    }
-
-    return [
-        'gtkx.config.ts: `libraries: "*"` binds whatever the build host happens to have installed, so the ' +
-        "store changes with the machine. Instead, list the libraries the project needs; the wildcard is " +
-        "removed in GTKX 2.0.",
-    ];
-};
-
-const configNotices = (config: Config, future: ResolvedFuture): string[] => [
-    ...unknownFutureNotice(unknownFutureKeys(config.future)),
-    ...wildcardLibrariesNotice(config.libraries),
-    ...redundantLibraryNotice(redundantLibraries(config.libraries, future.isAdwaitaDefault)),
-];
-
-const regeneratedStorePaths = (store: CodegenStore): string[] => {
-    if (store.react === null) {
-        return [store.giStoreDir, store.giLinkDir];
-    }
-
-    return [store.giStoreDir, store.giLinkDir, store.jsxStoreDir, store.jsxLinkDir];
-};
-
 const clearGeneratedStores = (store: CodegenStore): void => {
-    removeStores(regeneratedStorePaths(store));
+    removeStores(
+        store.react === null
+            ? [store.giStoreDir, store.giLinkDir]
+            : [store.giStoreDir, store.giLinkDir, store.jsxStoreDir, store.jsxLinkDir],
+    );
 };
 
-const resolveLoadedConfig = async (options: RunCodegenOptions, cwd: string): Promise<LoadedConfig> =>
-    options.resolved ?? (await loadConfig(cwd, { mode: options.mode }));
-
 const prepareCodegen = (options: RunCodegenOptions, cwd: string, config: Config): PreparedCodegen => {
     const { girPath, libraries, store } = options.inputs ?? resolveCodegenInputs(cwd, config);
 
@@ -219,17 +133,17 @@ const prepareCodegen = (options: RunCodegenOptions, cwd: string, config: Config)
 
 const runCodegen = async (options: RunCodegenOptions = {}): Promise<RunCodegenResult> => {
     const cwd = options.cwd ?? process.cwd();
-    const { config, configFile } = await resolveLoadedConfig(options, cwd);
-    const future = resolveFuture(config.future);
-    const configured = configNotices(config, future);
-    warnNotices(configured);
+    const { config, configFile } = options.resolved ?? (await loadConfig(cwd, {
+        mode: options.mode,
+        configFile: options.configFile,
+    }));
     await syncI18n(cwd, config.applicationId, options.shouldPreserveI18nMetadata);
-    syncSchemaEnv(cwd, future.isResourceImported);
+    emitSchemaEnv(cwd);
 
     if (config.codegen === false) {
         removeShadowingStores(cwd);
 
-        return disabledCodegenResult(configFile, configured);
+        return disabledCodegenResult(configFile);
     }
 
     const { girPath, libraries, store, isForced } = prepareCodegen(options, cwd, config);
@@ -239,35 +153,28 @@ const runCodegen = async (options: RunCodegenOptions = {}): Promise<RunCodegenRe
     }
 
     const result = await runCodegenCore({
-        ...codegenOptions({ store, libraries, girPath, elements: config.elements, future }),
+        ...codegenOptions({ store, libraries, girPath, elements: config.elements }),
         isForced,
     });
 
-    warnNotices(result.notices);
-    const notices = [...configured, ...result.notices];
     const reference = await writeReference({ root: cwd, config, girPath, libraries, isForced });
-    syncAgentRules(cwd, config);
+
+    if (isAgentRulesEnabled(config)) {
+        upsertAgentRules(cwd);
+    }
 
     return {
         isRegenerated: result.isRegenerated,
         namespaces: result.namespaces,
         intrinsicElements: result.intrinsicElements,
-        notices,
         duration: result.duration,
         girPath,
         configFile,
         libraries,
-        future: enabledFutureFlags(config),
         reference,
     };
 };
 
-const syncAgentRules = (root: string, config: Config): void => {
-    if (isAgentRulesEnabled(config)) {
-        upsertAgentRules(root);
-    }
-};
-
 const syncI18n = async (
     root: string,
     applicationId: string,
@@ -276,21 +183,21 @@ const syncI18n = async (
     const project = resolveCatalogProject(root, applicationId);
 
     if (project === null) {
-        emitI18nTypes(root, [], false);
+        clearI18nTypes(root);
 
         return;
     }
 
     const srcDir = join(root, "src");
     const sourceFiles = discoverSourceFiles(existsSync(srcDir) ? srcDir : root);
-    const catalog = await extractSourceCatalog(project, sourceFiles, shouldPreserveMetadataMessages);
+    await extractSourceCatalog(project, sourceFiles, shouldPreserveMetadataMessages);
     synchronizeCatalogs(project);
-    emitI18nTypes(root, catalog.messages);
+    await emitI18nTypes(root);
 };
 
-const isCodegenDisabled = async (cwd: string, mode?: string): Promise<boolean> => {
+const isCodegenDisabled = async (cwd: string, mode?: string, configFile?: string): Promise<boolean> => {
     try {
-        const { config } = await loadConfig(cwd, { mode });
+        const { config } = await loadConfig(cwd, { mode, configFile });
 
         return config.codegen === false;
     } catch {
@@ -298,11 +205,6 @@ const isCodegenDisabled = async (cwd: string, mode?: string): Promise<boolean> =
     }
 };
 
-const syncSchemaEnv = (cwd: string, isV2ResourceImports = false): void => {
-    const dataDir = isV2ResourceImports ? null : resolveDataDir(cwd);
-    emitSchemaEnv(cwd, dataDir, isV2ResourceImports);
-};
-
 const resolveInputsOrNull = (cwd: string, config: Config): CodegenInputs | null => {
     try {
         return resolveCodegenInputs(cwd, config);
@@ -321,20 +223,6 @@ const maybeAnnounceStale = (shouldAnnounce: boolean | undefined, inputs: Codegen
     }
 };
 
-const getRunOptions = ({
-    root,
-    mode,
-    inputs,
-    resolved,
-    shouldPreserveI18nMetadata,
-}: RunOptionsInput): RunCodegenOptions => {
-    if (inputs === null) {
-        return { cwd: root, mode, resolved, shouldPreserveI18nMetadata };
-    }
-
-    return { cwd: root, mode, inputs, resolved, shouldPreserveI18nMetadata };
-};
-
 const isPreflightSkipped = (options: EnsureGeneratedOptions): boolean =>
     options.shouldAnnounce === true && process.env.GTKX_DISABLE_PREFLIGHT === "1";
 
@@ -355,13 +243,13 @@ const generate = async (context: CodegenContext, options: EnsureGeneratedOptions
     maybeAnnounceStale(options.shouldAnnounce, inputs);
     const resolved = { config: context.config, configFile: context.configFile };
 
-    const result = await runCodegen(getRunOptions({
-        root: context.root,
+    const result = await runCodegen({
+        cwd: context.root,
         mode: options.mode,
-        inputs,
         resolved,
         shouldPreserveI18nMetadata: options.shouldPreserveI18nMetadata,
-    }));
+        ...(inputs !== null && { inputs }),
+    });
 
     return result.isRegenerated;
 };
@@ -374,18 +262,21 @@ const ensureGeneratedIn = async (
 
 /* eslint-disable-next-line unicorn/consistent-boolean-name -- the boolean reports whether codegen ran */
 const ensureGenerated = async (cwd: string, options: EnsureGeneratedOptions = {}): Promise<boolean> =>
-    isPreflightSkipped(options) ? false : generate(await resolveCodegenContext(cwd, options.mode), options);
+    isPreflightSkipped(options)
+        ? false
+        : generate(await resolveCodegenContext(cwd, options.mode, options.configFile), options);
 
 const resolveConfigWatch = async (
     cwd: string,
     mode?: string,
+    configFile?: string,
 ): Promise<{ paths: string[]; regenerate: () => Promise<void> }> => {
-    const { configFile, root } = await loadConfig(cwd, { mode });
+    const loaded = await loadConfig(cwd, { mode, configFile });
 
     return {
-        paths: [resolve(root, configFile)],
+        paths: [resolve(loaded.root, loaded.configFile)],
         regenerate: async () => {
-            await runCodegen({ cwd: root, mode });
+            await runCodegen({ cwd: loaded.root, mode, configFile: loaded.configFile });
         },
     };
 };

package/src/codegen/store-resolver.ts

@@ -1,6 +1,6 @@
 import { resolveStore } from "@gtkx/codegen";
 import { type Config, loadConfig } from "@gtkx/config";
-import { existsSync, readFileSync, realpathSync } from "node:fs";
+import { existsSync } from "node:fs";
 import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
 import { pathToFileURL } from "node:url";
@@ -16,39 +16,23 @@ type CodegenStore = {
 
 type CodegenReactPackage = {
     version: string;
-    subexports: string[];
 };
 
-type ResolvedPackage = { dir: string; version: string };
-
 type CodegenContext = {
     root: string;
     config: Config;
     configFile: string;
 };
 
-const readVersion = (packageJsonPath: string): string => {
-    const parsed = JSON.parse(readFileSync(packageJsonPath, "utf8")) as { version?: string };
-
-    return parsed.version ?? "0.0.0";
-};
-
-const resolvePackage = (require: NodeJS.Require, dir: string, packageName: string): ResolvedPackage | null => {
+const hasPackage = (require: NodeJS.Require, dir: string, packageName: string): boolean => {
     try {
-        const real = realpathSync(require.resolve(`${packageName}/package.json`));
+        require.resolve(`${packageName}/package.json`);
 
-        return { dir: dirname(real), version: readVersion(real) };
+        return true;
     } catch {
         const unscoped = packageName.replace(/^@[^/]+\//, "");
-        const workspacePkg = join(dir, "packages", unscoped, "package.json");
-
-        if (!existsSync(workspacePkg)) {
-            return null;
-        }
-
-        const real = realpathSync(workspacePkg);
 
-        return { dir: dirname(real), version: readVersion(real) };
+        return existsSync(join(dir, "packages", unscoped, "package.json"));
     }
 };
 
@@ -57,12 +41,12 @@ const siblingStore = (giDir: string): string => join(dirname(giDir), "jsx");
 const resolveCodegenStore = (dir: string): CodegenStore => {
     const require = createRequire(pathToFileURL(join(dir, "__gtkx_resolver__.js")).href);
 
-    if (resolvePackage(require, dir, "@gtkx/native") === null) {
+    if (!hasPackage(require, dir, "@gtkx/native")) {
         throw new Error("Cannot resolve @gtkx/native from the project; is it installed?");
     }
 
     const store = resolveStore(dir);
-    const hasReactRuntime = resolvePackage(require, dir, "react") !== null;
+    const hasReactRuntime = hasPackage(require, dir, "react");
 
     return {
         giStoreDir: store.gi.storeDir,
@@ -72,13 +56,13 @@ const resolveCodegenStore = (dir: string): CodegenStore => {
         runtimeVersion: store.gi.version,
         react:
             hasReactRuntime && store.jsx !== null
-                ? { version: store.jsx.version, subexports: store.reactSubexports }
+                ? { version: store.jsx.version }
                 : null,
     };
 };
 
-const resolveCodegenContext = async (cwd: string, mode?: string): Promise<CodegenContext> => {
-    const { config, configFile } = await loadConfig(cwd, { mode });
+const resolveCodegenContext = async (cwd: string, mode?: string, selectedConfig?: string): Promise<CodegenContext> => {
+    const { config, configFile } = await loadConfig(cwd, { mode, configFile: selectedConfig });
 
     return { root: cwd, config, configFile };
 };

package/src/commands/build.ts

@@ -1,7 +1,8 @@
 import { info } from "@gtkx/utils";
 import { defineCommand } from "citty";
 import { build as buildApp } from "../builder.js";
-import { entryArg } from "../internal/entry-arg.js";
+import { prepareBuildOutDir, resolveBuildOutDir } from "../internal/build-output.js";
+import { configArg, entryArg } from "../internal/entry-arg.js";
 import { prepareProject } from "../internal/prepare-project.js";
 
 const BUILD_MODE = "production";
@@ -13,18 +14,28 @@ const build = defineCommand({
     },
     args: {
         ...entryArg,
+        ...configArg,
+        out: {
+            type: "string",
+            description: "Output directory below the project root (default: dist)",
+        },
     },
     async run({ args }) {
-        const { cwd, entry } = await prepareProject(args, BUILD_MODE);
+        const { cwd, entry, configFile } = await prepareProject(args, BUILD_MODE);
+        const outDir = resolveBuildOutDir(cwd, args.out);
+        using preparedOutput = prepareBuildOutDir(cwd, outDir);
         info(`Building ${entry}`);
 
         const bundlePath = await buildApp({
             entry,
+            configFile,
             vite: {
                 root: cwd,
+                build: { outDir: preparedOutput.path, emptyOutDir: false },
             },
         });
 
+        preparedOutput.commit();
         info(`Build complete: ${bundlePath}`);
     },
 });

package/src/commands/codegen.ts

@@ -2,7 +2,7 @@ import { info } from "@gtkx/utils";
 import { defineCommand } from "citty";
 import { formatCodegenResult } from "../codegen/report.js";
 import { ensureGenerated, isCodegenDisabled, runCodegen } from "../codegen/run-codegen.js";
-import { cwdArg, resolveCwd } from "../internal/entry-arg.js";
+import { configArg, cwdArg, resolveCwd } from "../internal/entry-arg.js";
 
 const FORCED_WHILE_DISABLED_MESSAGE =
     "codegen is disabled for this project, so --force has no store to regenerate here. " +
@@ -20,29 +20,30 @@ const codegen = defineCommand({
             description: "Wipe the generated store and regenerate unconditionally (recover a corrupted store)",
             default: false,
         },
+        ...configArg,
         ...cwdArg,
     },
     async run({ args }) {
         const cwd = resolveCwd(args);
-        const isDisabled = await isCodegenDisabled(cwd);
+        const isDisabled = await isCodegenDisabled(cwd, undefined, args.config);
         checkForce(isDisabled, args.force);
 
         if (isDisabled) {
-            await runCodegen({ cwd });
+            await runCodegen({ cwd, configFile: args.config });
             info("codegen: disabled for this project; reusing an installed binding store");
 
             return;
         }
 
         if (!args.force) {
-            const isRan = await ensureGenerated(cwd);
+            const isRan = await ensureGenerated(cwd, { configFile: args.config });
             info(isRan ? "codegen: regenerated stale bindings" : "codegen: bindings up to date");
 
             return;
         }
 
         const startedAt = Date.now();
-        const result = await runCodegen({ cwd, isForced: true });
+        const result = await runCodegen({ cwd, configFile: args.config, isForced: true });
         const lines = formatCodegenResult(result, Date.now() - startedAt);
 
         for (const line of lines) {

package/src/commands/deploy.ts

@@ -1,7 +1,7 @@
 import { defineCommand } from "citty";
 import { KNOWN_NAMES } from "../deploy/registry.js";
 import { runDeploy } from "../deploy/run-deploy.js";
-import { entryArg } from "../internal/entry-arg.js";
+import { configArg, entryArg } from "../internal/entry-arg.js";
 import { resolveProject } from "../internal/prepare-project.js";
 
 const DEPLOY_MODE = "production";
@@ -13,6 +13,7 @@ const deploy = defineCommand({
     },
     args: {
         ...entryArg,
+        ...configArg,
         target: {
             type: "string",
             description: `Comma-separated package formats to build (${KNOWN_NAMES})`,
@@ -31,11 +32,12 @@ const deploy = defineCommand({
         },
     },
     async run({ args }) {
-        const { cwd, entry } = await resolveProject(args, DEPLOY_MODE);
+        const { cwd, entry, configFile } = await resolveProject(args, DEPLOY_MODE);
 
         await runDeploy({
             entry,
             cwd,
+            configFile,
             targets: args.target,
             outDir: args.out,
             shouldPrintManifests: args["print-manifests"] === true,

package/src/commands/dev.ts

@@ -1,5 +1,6 @@
 import { defineCommand } from "citty";
 import { resolveConfigWatch } from "../codegen/run-codegen.js";
+import { startHeadlessDevDisplay } from "../dev/headless.js";
 import { type DevWatch, runDevSupervisor } from "../dev/supervisor.js";
 import { splitApplicationArgs } from "../internal/application-args.js";
 import { entryArg } from "../internal/entry-arg.js";
@@ -14,12 +15,30 @@ const dev = defineCommand({
     },
     args: {
         ...entryArg,
+        headless: {
+            type: "boolean",
+            description: "Run on an isolated headless Wayland display",
+        },
+        size: {
+            type: "string",
+            description: "Headless display size as WIDTHxHEIGHT",
+        },
     },
     async run({ args }) {
+        if (args.size !== undefined && !args.headless) {
+            throw new Error("--size requires --headless");
+        }
+
         const { cwd, entry: entryPath } = await prepareProject(args, DEV_MODE);
         const watch: DevWatch | undefined = await resolveConfigWatch(cwd, DEV_MODE);
         const { applicationArgs } = splitApplicationArgs(process.argv.slice(2));
-        await runDevSupervisor({ entryPath, cwd, args: applicationArgs, watch });
+        const stopHeadless = args.headless ? await startHeadlessDevDisplay(args.size) : undefined;
+
+        try {
+            await runDevSupervisor({ entryPath, cwd, args: applicationArgs, watch });
+        } finally {
+            stopHeadless?.();
+        }
     },
 });
 

package/src/commands/docs.ts

@@ -1,10 +1,10 @@
 import { mergeOmittedProps, resolveGirPath, resolveLibraries } from "@gtkx/codegen";
 import { writeDocs } from "@gtkx/codegen/internal";
 import { loadConfig } from "@gtkx/config";
-import { resolveFuture, resolveOmittedProps } from "@gtkx/config/internal";
-import { info } from "@gtkx/utils";
+import { resolveOmittedProps } from "@gtkx/config/internal";
+import { info, isPathInside } from "@gtkx/utils";
 import { defineCommand } from "citty";
-import { isAbsolute, relative, resolve, sep } from "node:path";
+import { resolve } from "node:path";
 import { resolveDocsElements } from "../internal/docs-elements.js";
 import { cwdArg, resolveCwd } from "../internal/entry-arg.js";
 
@@ -57,8 +57,7 @@ const docs = defineCommand({
             );
         }
 
-        const future = resolveFuture(config.future);
-        const libraries = resolveLibraries(config.libraries, girPath, future.isAdwaitaDefault);
+        const libraries = resolveLibraries(config.libraries);
         const startedAt = Date.now();
         const outDir = resolveOutDir(cwd, args.out);
         const builtin = await resolveDocsElements(cwd);
@@ -71,11 +70,6 @@ const docs = defineCommand({
             props: builtin.props,
             omittedProps: mergeOmittedProps(builtin.omittedProps, resolveOmittedProps(config.elements)),
             isForced: args.force,
-            isByteArrayTyped: future.isByteArrayTyped,
-            isValueUnwrapped: future.isValueUnwrapped,
-            isFinishTrimmed: future.isFinishTrimmed,
-            isInoutInPlace: future.isInoutInPlace,
-            isTreeShaken: future.isTreeShaken,
         });
 
         if (!isRegenerated) {
@@ -93,12 +87,6 @@ const docs = defineCommand({
     },
 });
 
-const isBelow = (parent: string, child: string): boolean => {
-    const path = relative(parent, child);
-
-    return path !== "" && path !== ".." && !path.startsWith(`..${sep}`) && !isAbsolute(path);
-};
-
 const outDirReason = (cwd: string, out: string, outDir: string): string => {
     if (out.trim() === "") {
         return "it was empty, which names the project root itself";
@@ -114,7 +102,7 @@ const outDirReason = (cwd: string, out: string, outDir: string): string => {
 const resolveOutDir = (cwd: string, out: string): string => {
     const outDir = out.trim() === "" ? cwd : resolve(cwd, out);
 
-    if (isBelow(cwd, outDir)) {
+    if (isPathInside(cwd, outDir)) {
         return outDir;
     }