@gtkx/cli 1.0.0 → 1.2.0

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

@@ -1,7 +1,10 @@
+import type { StoreOptions } from "@gtkx/codegen";
 import type { ConfigLoader } from "@gtkx/config";
 import type { Plugin, UserConfig } from "vite";
-import { discoverGirNamespaces, resolveGirPath } from "@gtkx/codegen";
+import { discoverGirNamespaces, resolveGirPath, resolveStore } from "@gtkx/codegen";
 import { createConfigLoader } from "@gtkx/config/internal";
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
 
 type PluginState = {
     root: string;
@@ -9,7 +12,14 @@ type PluginState = {
     girPath: string[] | null;
 };
 
-const GENERATED_MODULE_PATTERN = /^@gtkx\/(?:gi|jsx)\/([a-z0-9]+)$/;
+type GeneratedModule = {
+    source: string;
+    kind: string;
+    namespace: string;
+    importer: string;
+};
+
+const GENERATED_MODULE_PATTERN = /^@gtkx\/(gi|jsx)\/([a-z0-9]+)$/;
 
 const girSearchPaths = async (state: PluginState): Promise<string[]> => {
     if (state.girPath === null) {
@@ -25,24 +35,76 @@ const getNamespace = (identifier: string): string => identifier.slice(0, identif
 const findGirIdentifier = (girPath: string[], namespace: string): string | undefined =>
     discoverGirNamespaces(girPath).find((identifier) => getNamespace(identifier) === namespace);
 
-const undeclaredLibraryError = (source: string, namespace: string, girPath: string[]): Error => {
-    const identifier = findGirIdentifier(girPath, namespace);
+const parseGeneratedModule = (source: string, importer: string | undefined): GeneratedModule | null => {
+    const matched = GENERATED_MODULE_PATTERN.exec(source);
+    const kind = matched?.[1];
+    const namespace = matched?.[2];
+
+    if (kind === undefined || namespace === undefined) {
+        return null;
+    }
+
+    return { source, kind, namespace, importer: importer ?? "the project's sources" };
+};
+
+const getStoreOptions = (root: string, kind: string): StoreOptions | null => {
+    try {
+        const store = resolveStore(root);
+
+        return kind === "gi" ? store.gi : store.jsx;
+    } catch {
+        return null;
+    }
+};
+
+const hasNamespaceModule = (storeDir: string, namespace: string): boolean => {
+    const manifest = join(storeDir, "package.json");
+
+    if (!existsSync(manifest)) {
+        return false;
+    }
+
+    const { exports } = JSON.parse(readFileSync(manifest, "utf8")) as { exports?: Record<string, unknown> };
+
+    return exports?.[`./${namespace}`] !== undefined;
+};
+
+const unreachableStoreError = (generated: GeneratedModule, options: StoreOptions): Error =>
+    new Error(
+        `Cannot resolve "${generated.source}": the generated store in ${options.storeDir} does provide ` +
+        `"${generated.namespace}", but its link at ${options.linkDir} is not on the module resolution path of ` +
+        `${generated.importer}. Codegen writes the store into the node_modules the installed @gtkx packages ` +
+        "resolve from; install them where the importing file reaches them, then run gtkx codegen again.",
+    );
+
+const undeclaredLibraryError = (generated: GeneratedModule, girPath: string[]): Error => {
+    const identifier = findGirIdentifier(girPath, generated.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.",
+            `Cannot resolve "${generated.source}": the binding store has no "${generated.namespace}" module, and no ` +
+            `GIR data for it was found in [${girPath.join(", ")}]. If "${generated.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.",
         );
     }
 
     return new Error(
-        `Cannot resolve "${source}": the "${identifier}" bindings have not been generated. ` +
+        `Cannot resolve "${generated.source}": the "${identifier}" bindings have not been generated. ` +
         `Add "${identifier}" to \`libraries\` in gtkx.config.ts, then run gtkx dev or gtkx build again.`,
     );
 };
 
+const unresolvedModuleError = async (state: PluginState, generated: GeneratedModule): Promise<Error> => {
+    const options = getStoreOptions(state.root, generated.kind);
+
+    if (options !== null && hasNamespaceModule(options.storeDir, generated.namespace)) {
+        return unreachableStoreError(generated, options);
+    }
+
+    return undeclaredLibraryError(generated, await girSearchPaths(state));
+};
+
 function gtkxUndeclaredLibrary(loadConfig: ConfigLoader = createConfigLoader()): Plugin {
     const state: PluginState = {
         root: "",
@@ -59,9 +121,9 @@ function gtkxUndeclaredLibrary(loadConfig: ConfigLoader = createConfigLoader()):
         },
 
         async resolveId(source, importer, options) {
-            const namespace = GENERATED_MODULE_PATTERN.exec(source)?.[1];
+            const generated = parseGeneratedModule(source, importer);
 
-            if (namespace === undefined) {
+            if (generated === null) {
                 return;
             }
 
@@ -71,7 +133,7 @@ function gtkxUndeclaredLibrary(loadConfig: ConfigLoader = createConfigLoader()):
                 return;
             }
 
-            throw undeclaredLibraryError(source, namespace, await girSearchPaths(state));
+            throw await unresolvedModuleError(state, generated);
         },
     };
 }

package/src/vite-plugins/worker.ts

@@ -1,6 +1,7 @@
 import type { Plugin, Rollup } from "vite";
 import { createHash } from "node:crypto";
 import { basename, extname } from "node:path";
+import { ESM_EXTENSION } from "./esm-extension.js";
 import { stripQuery } from "./strip-query.js";
 
 type WorkerReplacement = {
@@ -52,6 +53,8 @@ const NON_CODE = new RegExp(
     "g",
 );
 
+const WORKER_DIR = "workers";
+
 const SUGGESTED_EXTENSIONS: Record<string, string[]> = {
     ".cjs": [".cts"],
     ".js": [".ts", ".tsx"],
@@ -64,7 +67,7 @@ const workerFileName = (id: string): string => {
     const stem = basename(path, extname(path));
     const digest = createHash("sha256").update(id).digest("hex").slice(0, 8);
 
-    return `workers/${stem}-${digest}.js`;
+    return `${WORKER_DIR}/${stem}-${digest}${ESM_EXTENSION}`;
 };
 
 const nonCodeRanges = (code: string): SourceRange[] =>

package/dist/internal.d.ts

@@ -1,3 +0,0 @@
-export { dispatch } from "./mcp/handlers.js";
-export { WidgetRegistry } from "./mcp/widget-registry.js";
-//# sourceMappingURL=internal.d.ts.map

package/dist/internal.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../src/internal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC"}

package/dist/internal.js

@@ -1,3 +0,0 @@
-export { dispatch } from "./mcp/handlers.js";
-export { WidgetRegistry } from "./mcp/widget-registry.js";
-//# sourceMappingURL=internal.js.map

package/dist/internal.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"internal.js","sourceRoot":"","sources":["../src/internal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC","sourcesContent":["export { dispatch } from \"./mcp/handlers.js\";\nexport { WidgetRegistry } from \"./mcp/widget-registry.js\";\n"]}

package/src/internal.ts

@@ -1,2 +0,0 @@
-export { dispatch } from "./mcp/handlers.js";
-export { WidgetRegistry } from "./mcp/widget-registry.js";