@gtkx/cli 1.6.0 → 2.0.0-beta.1

package/src/vite-plugins/resources.ts

@@ -1,20 +1,17 @@
 import type { ConfigLoader } from "@gtkx/config";
 import type { ModuleNode, Plugin, ResolvedConfig, Rolldown, UserConfig, ViteDevServer } from "vite";
-import { createConfigLoader, resolveFuture, resourceBasePath } from "@gtkx/config/internal";
-import { error, info, isRecord, sortStrings } from "@gtkx/utils";
+import { createConfigLoader, resourceBasePath } from "@gtkx/config/internal";
+import { error, info, isPathInside, isRecord, sortStrings, toPosixPath } from "@gtkx/utils";
 import { copyFileSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, extname, isAbsolute, join, posix, relative, sep } from "node:path";
 import { parseSync } from "vite";
-import { resolveDataDir } from "../internal/data-dir.js";
-import { type ListedFile, listFilesRecursive } from "../internal/list-files.js";
+import { withExclusiveLoad } from "../internal/module-loads.js";
 import { runCliTool } from "../internal/run-cli-tool.js";
 import { parseRuntimeImportsIn, type SourceImport, sourceLanguage } from "../internal/source-imports.js";
 import { createRetainedStagingDir, type RetainedStagingDir, withStagingDir } from "../internal/staging-dir.js";
 import { ASSET_RE } from "./asset-extensions.js";
 import {
-    DATA_PREFIX,
     isBareRelativeAsset,
-    isDataAsset,
     parseIconSpecifier,
     parseResourceSpecifier,
 } from "./asset-specifier.js";
@@ -44,7 +41,6 @@ type PluginState = {
     prefix: string;
     root: string;
     isBuild: boolean;
-    isV2: boolean;
     entries: Map<string, ResourceEntry>;
     bundledSpecifiers: Map<string, Set<string>>;
     moduleDependencies: Map<string, Set<string>>;
@@ -58,7 +54,6 @@ type PluginState = {
     devBundlePath: string;
     server: ViteDevServer | null;
     compiledSignature: string;
-    dataDir: string | null;
     bundleReferenceId: string | null;
     iconOwners: Map<string, ResourceEntry>;
 };
@@ -118,7 +113,7 @@ type DerivedIconEntry = {
     resourcePath: string;
 };
 
-type LegacyResolveRequest = {
+type ResolveRequest = {
     source: string;
     importer: string | undefined;
     options: Record<string, unknown> | undefined;
@@ -128,6 +123,7 @@ const RESOURCE_COMPILER = "glib-compile-resources";
 const MANIFEST_PREFIX = "/";
 const DEV_STAGING_PREFIX = "resources-dev";
 const MANIFEST_FILENAME = "package.json";
+const DATA_PREFIX = "#data/";
 const BUNDLED_QUERY_MENTION_RE = /[?&](?:icon|resource)(?:[=&]|$)/;
 const ICON_EXTENSIONS: Set<string> = new Set([".png", ".svg", ".xpm"]);
 
@@ -164,16 +160,8 @@ const STOCK_ICON_CONTEXTS: Set<string> = new Set([
 const ICON_SIZE_RE = /^([1-9]\d*)x\1(?:@[1-9]\d*)?$/;
 const RESERVED_ICON_NAMES: Set<string> = new Set(["", ".", ".."]);
 
-const toForwardSlashes = (value: string): string => value.replaceAll(/[/\\]/g, "/");
-
-const isWithin = (root: string, path: string): boolean => {
-    const rel = relative(root, path);
-
-    return rel.length > 0 && !isAbsolute(rel) && rel !== ".." && !rel.startsWith(`..${sep}`);
-};
-
 const isDependencyFile = (root: string, path: string): boolean =>
-    isWithin(root, path) && relative(root, path).split(sep).includes("node_modules");
+    isPathInside(root, path) && relative(root, path).split(sep).includes("node_modules");
 
 const packageIdentityIn = (dir: string): string | null => {
     try {
@@ -216,17 +204,17 @@ const validateResourcePath = (resourcePath: string): string => {
 };
 
 const derivedResourcePath = (state: PluginState, sourcePath: string): string => {
-    if (isWithin(state.root, sourcePath) && !isDependencyFile(state.root, sourcePath)) {
-        return validateResourcePath(`${state.prefix}/${toForwardSlashes(relative(state.root, sourcePath))}`);
+    if (isPathInside(state.root, sourcePath) && !isDependencyFile(state.root, sourcePath)) {
+        return validateResourcePath(`${state.prefix}/${toPosixPath(relative(state.root, sourcePath))}`);
     }
 
     const owner = packageForFile(sourcePath);
 
-    if (owner === null || !isWithin(owner.dir, sourcePath)) {
+    if (owner === null || !isPathInside(owner.dir, sourcePath)) {
         throw new Error(`${sourcePath} is outside the application and does not belong to a named package`);
     }
 
-    const packagePath = toForwardSlashes(relative(owner.dir, sourcePath));
+    const packagePath = toPosixPath(relative(owner.dir, sourcePath));
 
     return validateResourcePath(`${state.prefix}/${owner.name}/${packagePath}`);
 };
@@ -292,7 +280,7 @@ const iconLayoutInParts = (parts: string[], beforeIndex: number): string | null
 };
 
 const iconLayoutFromTree = (sourcePath: string): string | null => {
-    const parts = toForwardSlashes(sourcePath).split("/");
+    const parts = toPosixPath(sourcePath).split("/");
 
     return iconLayoutInParts(parts, parts.length - 2);
 };
@@ -335,11 +323,10 @@ const hasSideEffectIconImport = (code: string, id: string): boolean => {
 };
 
 const retainSideEffectIconImport = (
-    state: PluginState,
     code: string,
     id: string,
 ): { code: string; moduleSideEffects: true } | null =>
-    state.isV2 && hasSideEffectIconImport(code, id)
+    hasSideEffectIconImport(code, id)
         ? { code, moduleSideEffects: true }
         : null;
 
@@ -430,20 +417,6 @@ const refreshRegisteredDevBundle = (state: PluginState): void => {
     }
 };
 
-const scanDataAssets = (dataDir: string): ListedFile[] => listFilesRecursive(dataDir, (name) => ASSET_RE.test(name));
-
-const primeLegacyDevBundle = (state: PluginState): void => {
-    if (state.dataDir === null) {
-        return;
-    }
-
-    for (const { absPath, rel } of scanDataAssets(state.dataDir)) {
-        registerEntry(state, absPath, rel);
-    }
-
-    compileDevBundle(state);
-};
-
 const registerDevAsset = (state: PluginState): void => {
     if (entriesSignature(state) !== state.compiledSignature) {
         compileDevBundle(state);
@@ -490,7 +463,7 @@ const activateEntry = (state: PluginState, entry: ResourceEntry): ResourceEntry
 };
 
 const isDeclarativeImporter = (state: PluginState, importer: string | undefined): importer is string =>
-    !state.isBuild && state.isV2 && importer !== undefined;
+    !state.isBuild && importer !== undefined;
 
 const setSourceAvailability = (state: PluginState, file: string, isAvailable: boolean): void => {
     if (isAvailable) {
@@ -713,26 +686,6 @@ const resolveIconEntry = async (
     };
 };
 
-const resolveLegacyAssetEntry = async (
-    ctx: ResolveContext,
-    state: PluginState,
-    request: LegacyResolveRequest,
-): Promise<ResourceEntry | undefined> => {
-    const resolved = await ctx.resolve(request.source, request.importer, { ...request.options, skipSelf: true });
-
-    if (!resolved || resolved.external) {
-        return undefined;
-    }
-
-    const sourcePath = stripQuery(resolved.id);
-
-    if (!isAbsolute(sourcePath)) {
-        return undefined;
-    }
-
-    return registerEntry(state, sourcePath, request.source.slice(DATA_PREFIX.length));
-};
-
 const loadInitModule = (state: PluginState): string => {
     if (state.isBuild) {
         if (state.bundleReferenceId === null) {
@@ -831,8 +784,7 @@ const loadAssetModule = (state: PluginState, virtualId: string): string => {
     const { absPath, iconName, rel } = virtualAssetMetadata(virtualId);
     const resourcePath = validateResourcePath(rel);
     const { entry, isRegistered } = loadedResourceEntry(state, absPath, resourcePath);
-    const uri = `resource://${entry.resourcePath}`;
-    const defaultValue = iconName ?? (state.isV2 ? entry.resourcePath : uri);
+    const defaultValue = iconName ?? entry.resourcePath;
     compileLoadedDevAsset(state, isRegistered);
 
     return [
@@ -899,12 +851,12 @@ const isSourceModule = (file: string): boolean => sourceLanguage(file) !== undef
 const isBundledSource = (source: string): boolean =>
     parseResourceSpecifier(source) !== null || parseIconSpecifier(source) !== null;
 
-const validateUnbundledV2Source = (source: string): void => {
+const validateUnbundledSource = (source: string): void => {
     if (isLegacyDataSpecifier(source)) {
         throw new Error(`${JSON.stringify(source)} uses the legacy #data asset form`);
     }
 
-    rejectInvalidV2Specifier(source);
+    rejectInvalidSpecifier(source);
 };
 
 const resolvedModuleDependency = async (
@@ -916,7 +868,7 @@ const resolvedModuleDependency = async (
         return null;
     }
 
-    validateUnbundledV2Source(source);
+    validateUnbundledSource(source);
     const resolved = await ctx.resolve(source, importer, { skipSelf: true });
 
     if (resolved === null) {
@@ -952,7 +904,7 @@ const importerReconciliation = async (
     const file = stripQuery(id);
     const key = importerKey(file);
 
-    if (!state.isV2 || state.isBuild || !isSourceModule(file)) {
+    if (state.isBuild || !isSourceModule(file)) {
         return null;
     }
 
@@ -1171,35 +1123,16 @@ const forgetImporterDeclarations = (state: PluginState, importer: string): void
     state.declaredIcons.delete(importer);
 };
 
-const cloneStringSetMap = (source: Map<string, Set<string>>): Map<string, Set<string>> => {
-    const clone: Map<string, Set<string>> = new Map();
-
-    for (const [key, values] of source) {
-        clone.set(key, new Set(values));
-    }
-
-    return clone;
-};
-
-const cloneDeclarationMap = (
-    source: Map<string, Map<string, ResourceEntry>>,
-): Map<string, Map<string, ResourceEntry>> => {
-    const clone: Map<string, Map<string, ResourceEntry>> = new Map();
-
-    for (const [key, declarations] of source) {
-        clone.set(key, new Map(declarations));
-    }
-
-    return clone;
-};
+const cloneMapValues = <Value>(source: Map<string, Value>, clone: (value: Value) => Value): Map<string, Value> =>
+    new Map([...source].map(([key, value]) => [key, clone(value)]));
 
 const reconciliationCandidate = (state: PluginState): PluginState => ({
     ...state,
-    bundledSpecifiers: cloneStringSetMap(state.bundledSpecifiers),
-    moduleDependencies: cloneStringSetMap(state.moduleDependencies),
-    prunedDependencies: cloneStringSetMap(state.prunedDependencies),
-    declaredEntries: cloneDeclarationMap(state.declaredEntries),
-    declaredIcons: cloneDeclarationMap(state.declaredIcons),
+    bundledSpecifiers: cloneMapValues(state.bundledSpecifiers, (values) => new Set(values)),
+    moduleDependencies: cloneMapValues(state.moduleDependencies, (values) => new Set(values)),
+    prunedDependencies: cloneMapValues(state.prunedDependencies, (values) => new Set(values)),
+    declaredEntries: cloneMapValues(state.declaredEntries, (entries) => new Map(entries)),
+    declaredIcons: cloneMapValues(state.declaredIcons, (entries) => new Map(entries)),
     missingSourcePaths: new Set(state.missingSourcePaths),
 });
 
@@ -1333,7 +1266,7 @@ const commitReconciliation = (state: PluginState, candidate: PluginState): void
     state.iconOwners = candidate.iconOwners;
 };
 
-const reconcileV2Importer = async (ctx: ResolveContext, state: PluginState, id: string): Promise<void> => {
+const reconcileImporter = async (ctx: ResolveContext, state: PluginState, id: string): Promise<void> => {
     const reconciliation = await importerReconciliation(ctx, state, id);
 
     if (reconciliation === null) {
@@ -1353,7 +1286,6 @@ const resolveResourceConfig = async (state: PluginState, config: UserConfig, loa
     const loaded = await loadConfig.load(config.root ?? process.cwd());
     state.prefix = resourceBasePath(loaded.config.applicationId);
     state.root = loaded.root;
-    state.isV2 = resolveFuture(loaded.config.future).isResourceImported;
 
     return {
         assetsInclude: [ASSET_RE],
@@ -1423,14 +1355,6 @@ const attachResourceWatcher = (state: PluginState, server: ViteDevServer): void
 const applyResolvedConfig = (state: PluginState, config: ResolvedConfig): void => {
     state.isBuild = config.command === "build";
     state.root = config.root;
-    state.dataDir = null;
-
-    if (state.isBuild || state.isV2) {
-        return;
-    }
-
-    const relativeDataDir = resolveDataDir(config.root);
-    state.dataDir = relativeDataDir === null ? null : join(config.root, relativeDataDir);
 };
 
 const loadResourceModule = (state: PluginState, id: string): string | undefined => {
@@ -1448,7 +1372,7 @@ const loadResourceModule = (state: PluginState, id: string): string | undefined
 const isLegacyDataSpecifier = (source: string): boolean =>
     source.startsWith(DATA_PREFIX) && ASSET_RE.test(stripQuery(source));
 
-const rejectInvalidV2Specifier = (source: string): void => {
+const rejectInvalidSpecifier = (source: string): void => {
     if (BUNDLED_QUERY_MENTION_RE.test(source)) {
         throw new Error(
             `${JSON.stringify(source)} is not a valid bundled asset import; use ?resource, ` +
@@ -1467,7 +1391,7 @@ const rejectInvalidV2Specifier = (source: string): void => {
 const resolveExplicitResourceId = async (
     ctx: ResolveContext,
     state: PluginState,
-    request: LegacyResolveRequest,
+    request: ResolveRequest,
 ): Promise<string | undefined> => {
     const specifier = parseResourceSpecifier(request.source);
 
@@ -1488,7 +1412,7 @@ const resolveExplicitResourceId = async (
 const resolveIconResourceId = async (
     ctx: ResolveContext,
     state: PluginState,
-    request: LegacyResolveRequest,
+    request: ResolveRequest,
 ): Promise<RetainedIconModuleId | undefined> => {
     const specifier = parseIconSpecifier(request.source);
 
@@ -1508,10 +1432,10 @@ const resolveIconResourceId = async (
         : { id: virtualIconId(resolved), moduleSideEffects: true };
 };
 
-const resolveV2ResourceId = async (
+const resolveBundledResourceId = async (
     ctx: ResolveContext,
     state: PluginState,
-    request: LegacyResolveRequest,
+    request: ResolveRequest,
 ): Promise<ResourceModuleId | undefined> => {
     if (isLegacyDataSpecifier(request.source)) {
         throw new Error(
@@ -1534,46 +1458,21 @@ const resolveV2ResourceId = async (
         return resolved;
     }
 
-    rejectInvalidV2Specifier(request.source);
+    rejectInvalidSpecifier(request.source);
 
     return undefined;
 };
 
-const resolveLegacyResourceId = async (
-    ctx: ResolveContext,
-    state: PluginState,
-    request: LegacyResolveRequest,
-): Promise<string | undefined> => {
-    if (BUNDLED_QUERY_MENTION_RE.test(request.source)) {
-        throw new Error(`${JSON.stringify(request.source)} requires future.v2ResourceImports`);
-    }
-
-    if (!isDataAsset(request.source)) {
-        return undefined;
-    }
-
-    const entry = await resolveLegacyAssetEntry(ctx, state, request);
-
-    return entry === undefined ? undefined : virtualAssetId(entry);
-};
-
 const resolveResourceId = (
     ctx: ResolveContext,
     state: PluginState,
-    request: LegacyResolveRequest,
+    request: ResolveRequest,
 ): Promise<ResourceModuleId | undefined> => {
     if (request.source === VIRTUAL_INIT) {
         return Promise.resolve(VIRTUAL_INIT);
     }
 
-    return state.isV2
-        ? resolveV2ResourceId(ctx, state, request)
-        : resolveLegacyResourceId(ctx, state, request);
-};
-
-const configureResourceServer = (state: PluginState, server: ViteDevServer): void => {
-    attachResourceWatcher(state, server);
-    primeLegacyDevBundle(state);
+    return resolveBundledResourceId(ctx, state, request);
 };
 
 const createResourcesPlugin = (state: PluginState, loadConfig: ConfigLoader): Plugin => ({
@@ -1588,7 +1487,7 @@ const createResourcesPlugin = (state: PluginState, loadConfig: ConfigLoader): Pl
     },
 
     configureServer: (server) => {
-        configureResourceServer(state, server);
+        attachResourceWatcher(state, server);
     },
 
     buildStart() {
@@ -1610,9 +1509,9 @@ const createResourcesPlugin = (state: PluginState, loadConfig: ConfigLoader): Pl
     },
 
     async transform(code, id) {
-        await reconcileV2Importer(this, state, id);
+        await withExclusiveLoad(state, () => reconcileImporter(this, state, id));
 
-        return retainSideEffectIconImport(state, code, id);
+        return retainSideEffectIconImport(code, id);
     },
 
     generateBundle(_options, bundle) {
@@ -1629,7 +1528,6 @@ function gtkxResources(loadConfig: ConfigLoader = createConfigLoader(), entryPat
         prefix: "",
         root: "",
         isBuild: false,
-        isV2: false,
         entries: new Map(),
         bundledSpecifiers: new Map(),
         moduleDependencies: new Map(),
@@ -1643,7 +1541,6 @@ function gtkxResources(loadConfig: ConfigLoader = createConfigLoader(), entryPat
         devBundlePath: "",
         server: null,
         compiledSignature: "",
-        dataDir: null,
         bundleReferenceId: null,
         iconOwners: new Map(),
     };

package/src/vite-plugins/settings-worker-env.ts

@@ -1,7 +1,6 @@
 import type { UserConfig } from "vite";
 import type { Plugin } from "vitest/config";
-import { createConfigLoader, resolveFuture } from "@gtkx/config/internal";
-import { resolveDataDir } from "../internal/data-dir.js";
+import { createConfigLoader } from "@gtkx/config/internal";
 import { prependSchemaDir, stageAndCompileProjectSchemas } from "../settings/schema.js";
 
 function gtkxSettingsWorkerEnv(): Plugin {
@@ -13,8 +12,7 @@ function gtkxSettingsWorkerEnv(): Plugin {
 
         async config(config: UserConfig) {
             const loaded = await loadConfig.load(config.root ?? process.cwd());
-            const dataDir = resolveFuture(loaded.config.future).isResourceImported ? null : resolveDataDir(loaded.root);
-            const dir = stageAndCompileProjectSchemas(loaded.root, dataDir);
+            const dir = stageAndCompileProjectSchemas(loaded.root);
 
             if (dir === null) {
                 return;

package/src/vite-plugins/settings.ts

@@ -1,13 +1,10 @@
-import type { ConfigLoader } from "@gtkx/config";
-import type { ModuleNode, Plugin, ResolvedConfig, UserConfig, ViteDevServer } from "vite";
-import { resolveFuture } from "@gtkx/config/internal";
+import type { ModuleNode, Plugin, ResolvedConfig, ViteDevServer } from "vite";
 import { error, errorMessage, info, sortStrings } from "@gtkx/utils";
 import { readFileSync } from "node:fs";
 import { basename, join } from "node:path";
 import type { BuildManifestCollector } from "../internal/build-manifest.js";
 import type { AssetEmitter } from "./asset-emitter.js";
 import { prependBanner } from "../internal/banner.js";
-import { resolveDataDir } from "../internal/data-dir.js";
 import { createRetainedStagingDir, type RetainedStagingDir, withStagingDir } from "../internal/staging-dir.js";
 import { compileSchemas } from "../settings/compile.js";
 import { parseSchemaXml, SchemaParseError } from "../settings/parser.js";
@@ -25,8 +22,6 @@ import { createVirtualNamespace } from "./virtual-module.js";
 type PluginState = {
     schemaDir: RetainedStagingDir;
     rootDir: string | null;
-    dataDir: string | null;
-    isV2ResourceImports: boolean;
     isBuild: boolean;
     schemaEnvTimer: ReturnType<typeof setTimeout> | null;
     trackedSchemas: Map<string, string>;
@@ -81,7 +76,7 @@ const syncSchemaEnv = (state: PluginState): void => {
     }
 
     try {
-        emitSchemaEnv(state.rootDir, state.dataDir, state.isV2ResourceImports);
+        emitSchemaEnv(state.rootDir);
     } catch (error_) {
         error(`Failed to generate GSettings schema types: ${errorMessage(error_)}`);
     }
@@ -105,12 +100,6 @@ const scheduleSchemaEnvSync = (state: PluginState): void => {
     }, SCHEMA_ENV_DEBOUNCE_MS);
 };
 
-const applyUserConfig = async (state: PluginState, config: UserConfig, loadConfig: ConfigLoader): Promise<void> => {
-    const loaded = await loadConfig.load(config.root ?? process.cwd());
-    state.isV2ResourceImports = resolveFuture(loaded.config.future).isResourceImported;
-    state.dataDir = state.isV2ResourceImports ? null : resolveDataDir(loaded.root);
-};
-
 const applyResolvedConfig = (state: PluginState, config: ResolvedConfig): void => {
     state.isBuild = config.command === "build";
     state.rootDir = typeof config.root === "string" ? config.root : null;
@@ -173,6 +162,12 @@ const compileBuildSchemas = (schemaFiles: string[]): Buffer =>
         return readFileSync(join(dir, "gschemas.compiled"));
     });
 
+const rejectLegacySchemaSpecifier = (source: string): void => {
+    if (source.startsWith("#data/")) {
+        throw new Error(`${JSON.stringify(source)} uses the legacy #data schema form`);
+    }
+};
+
 const buildSchemaPaths = (rootDir: string, schemaFiles: string[]): string[] =>
     schemaFiles.map((filePath) => {
         const rel = projectRelativeSchemaPath(rootDir, filePath);
@@ -262,12 +257,10 @@ const watchSchemaFiles = (state: PluginState, server: ViteDevServer): void => {
     server.watcher.on("unlink", refreshSchemaTypes);
 };
 
-function gtkxSettings(loadConfig: ConfigLoader, buildManifest?: BuildManifestCollector): Plugin {
+function gtkxSettings(buildManifest?: BuildManifestCollector): Plugin {
     const state: PluginState = {
         schemaDir: createRetainedStagingDir(SCHEMA_STAGING_PREFIX),
         rootDir: null,
-        dataDir: null,
-        isV2ResourceImports: false,
         isBuild: false,
         schemaEnvTimer: null,
         trackedSchemas: new Map(),
@@ -278,10 +271,6 @@ function gtkxSettings(loadConfig: ConfigLoader, buildManifest?: BuildManifestCol
         name: "gtkx:settings",
         enforce: "pre",
 
-        async config(config: UserConfig) {
-            await applyUserConfig(state, config, loadConfig);
-        },
-
         configResolved(config) {
             applyResolvedConfig(state, config);
         },
@@ -303,6 +292,8 @@ function gtkxSettings(loadConfig: ConfigLoader, buildManifest?: BuildManifestCol
                 return;
             }
 
+            rejectLegacySchemaSpecifier(source);
+
             return resolveToVirtual(this, { source, importer, options });
         },
 

package/src/vite-plugins/undeclared-library.ts

@@ -15,11 +15,12 @@ type PluginState = {
 type GeneratedModule = {
     source: string;
     kind: string;
-    namespace: string | null;
+    namespace: string;
     importer: string;
 };
 
 const GENERATED_MODULE_PATTERN = /^@gtkx\/(gi|jsx)\/([a-z0-9]+)$/;
+const DEFAULT_LIBRARY_NAMESPACES: Set<string> = new Set(["gtk", "adw"]);
 
 const girSearchPaths = async (state: PluginState): Promise<string[]> => {
     if (state.girPath === null) {
@@ -36,10 +37,6 @@ const findGirIdentifier = (girPath: string[], namespace: string): string | undef
     discoverGirNamespaces(girPath).find((identifier) => getNamespace(identifier) === namespace);
 
 const parseGeneratedModule = (source: string, importer: string | undefined): GeneratedModule | null => {
-    if (source === "@gtkx/jsx") {
-        return { source, kind: "jsx", namespace: null, importer: importer ?? "the project's sources" };
-    }
-
     const matched = GENERATED_MODULE_PATTERN.exec(source);
     const kind = matched?.[1];
     const namespace = matched?.[2];
@@ -74,7 +71,7 @@ const hasStoreModule = (storeDir: string, exportKey: string): boolean => {
 };
 
 const unreachableStoreError = (generated: GeneratedModule, options: StoreOptions): Error => {
-    const provided = generated.namespace === null ? "its index module" : `"${generated.namespace}"`;
+    const provided = `"${generated.namespace}"`;
 
     return new Error(
         `Cannot resolve "${generated.source}": the generated store in ${options.storeDir} does provide ` +
@@ -84,21 +81,22 @@ const unreachableStoreError = (generated: GeneratedModule, options: StoreOptions
     );
 };
 
-const missingIndexError = (generated: GeneratedModule): Error =>
-    new Error(
-        `Cannot resolve "${generated.source}": the binding store has no index module. ` +
-        "Run gtkx codegen to regenerate the store.",
-    );
-
 const undeclaredLibraryError = (source: string, namespace: string, girPath: string[]): Error => {
     const identifier = findGirIdentifier(girPath, namespace);
 
     if (identifier === undefined) {
         return new Error(
             `Cannot resolve "${source}": the binding store has no "${namespace}" module, and no ` +
-            `GIR data for it was found in [${girPath.join(", ")}]. If "${namespace}" is a library, ` +
-            "install its gobject-introspection data package and add its GIR identifier to `libraries` in " +
-            "gtkx.config.ts. Otherwise run gtkx codegen to regenerate the store.",
+            `GIR data for it was found in [${girPath.join(", ")}]. If "${namespace}" is a library, install ` +
+            "its gobject-introspection data package. Gtk-4.0 and Adw-1 are bound by default; add only other " +
+            "GIR identifiers to `libraries` in gtkx.config.ts. Otherwise run gtkx codegen to regenerate the store.",
+        );
+    }
+
+    if (DEFAULT_LIBRARY_NAMESPACES.has(namespace)) {
+        return new Error(
+            `Cannot resolve "${source}": the "${identifier}" bindings have not been generated. ` +
+            "The Gtk and Adwaita namespaces are bound by default; run gtkx dev or gtkx build again.",
         );
     }
 
@@ -110,16 +108,12 @@ const undeclaredLibraryError = (source: string, namespace: string, girPath: stri
 
 const unresolvedModuleError = async (state: PluginState, generated: GeneratedModule): Promise<Error> => {
     const options = getStoreOptions(state.root, generated.kind);
-    const exportKey = generated.namespace === null ? "." : `./${generated.namespace}`;
+    const exportKey = `./${generated.namespace}`;
 
     if (options !== null && hasStoreModule(options.storeDir, exportKey)) {
         return unreachableStoreError(generated, options);
     }
 
-    if (generated.namespace === null) {
-        return missingIndexError(generated);
-    }
-
     return undeclaredLibraryError(generated.source, generated.namespace, await girSearchPaths(state));
 };
 

package/src/vite-plugins/worker.ts

@@ -56,7 +56,6 @@ const NON_CODE = new RegExp(
 const WORKER_DIR = "workers";
 
 const SUGGESTED_EXTENSIONS: Record<string, string[]> = {
-    ".cjs": [".cts"],
     ".js": [".ts", ".tsx"],
     ".jsx": [".tsx"],
     ".mjs": [".mts"],

package/dist/i18n/binding-extractor.d.ts

@@ -1,30 +0,0 @@
-type ScopeInfo = {
-    defaultNs?: string;
-    keyPrefix?: string;
-    namespaces?: string[];
-};
-type ExtractedCall = {
-    info: ScopeInfo;
-    key: string;
-};
-type ExtractedMessage = {
-    defaultValue: string;
-    explicitDefault: boolean;
-    key: string;
-    location: {
-        column?: number;
-        file: string;
-        line?: number;
-    };
-    ns?: string;
-};
-type BindingExtraction = {
-    blockedGetFixedT: Set<string>;
-    calls: Map<string, ExtractedCall>;
-    errors: string[];
-    messages: ExtractedMessage[];
-    trans: Map<string, ScopeInfo | null>;
-};
-declare const extractBindings: (code: string, path: string) => Promise<BindingExtraction>;
-export { type BindingExtraction, type ScopeInfo, extractBindings };
-//# sourceMappingURL=binding-extractor.d.ts.map

package/dist/i18n/binding-extractor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"binding-extractor.d.ts","sourceRoot":"","sources":["../../src/i18n/binding-extractor.ts"],"names":[],"mappings":"AAgBA,KAAK,SAAS,GAAG;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAiBF,KAAK,aAAa,GAAG;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE;QACN,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,EAAE,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACrB,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAClC,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,gBAAgB,EAAE,CAAC;IAC7B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAAC,CAAC;CACxC,CAAC;AAslBF,QAAA,MAAM,eAAe,GAAU,MAAM,MAAM,EAAE,MAAM,MAAM,KAAG,OAAO,CAAC,iBAAiB,CA6BpF,CAAC;AAiwCF,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,SAAS,EAAE,eAAe,EAAE,CAAC"}