@gtkx/cli 1.5.0 → 2.0.0-beta.1

package/src/vite-plugins/settings.ts

@@ -1,12 +1,10 @@
-import type { ConfigLoader } from "@gtkx/config";
-import type { ModuleNode, Plugin, ResolvedConfig, UserConfig, ViteDevServer } from "vite";
+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";
@@ -24,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>;
@@ -80,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_)}`);
     }
@@ -104,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 = loaded.config.future?.v2ResourceImports === true;
-    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;
@@ -172,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);
@@ -261,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(),
@@ -277,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);
         },
@@ -302,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"}