@gtkx/cli 2.0.0-beta.1 → 2.0.0-beta.10

package/src/vite-plugins/asset-imports.ts

@@ -1,10 +1,11 @@
 import type { ParseResult, Plugin } from "vite";
 import { parseSync } from "vite";
-import { sourceLanguage } from "../internal/source-imports.js";
+import { SOURCE_ID_RE, sourceLanguage } from "../internal/source-imports.js";
 import { ASSET_MENTION_RE } from "./asset-extensions.js";
 import {
     isAssetSpecifier,
     isUrlSpecifier,
+    parseFontSpecifier,
     parseIconSpecifier,
     parseResourceSpecifier,
 } from "./asset-specifier.js";
@@ -19,7 +20,10 @@ type BindingEntry = { importName: { name: string | null }; isType: boolean };
 type NamedBinding = { name: string; source: string };
 
 const NODE_MODULES = /(?:^|\/)node_modules\//;
+const NODE_MODULES_ID_RE = /^[^?]*(?:^|\/)node_modules\//;
 const VIRTUAL_PREFIX = "\0";
+const VIRTUAL_ID_RE = /^\0/;
+const URL_QUERY = "?url";
 const DEFAULT_BINDING = "default";
 const RESOURCE_BINDING = JSON.stringify(RESOURCE_PATH_EXPORT);
 
@@ -31,8 +35,11 @@ const RESOURCE_ADVICE =
 
 const ICON_ADVICE = "An icon asset exports only its default icon-theme name, and nothing else.";
 
+const FONT_ADVICE = "A font asset exports only its default font family name, and nothing else.";
+
 const RELATIVE_ADVICE =
-    "Add ?resource for a GResource, ?icon for a themed icon, or ?url for an emitted file.";
+    "Add ?resource for a GResource, ?icon for a themed icon, ?font for a bundled font, or ?url for an " +
+    "emitted file.";
 
 const boundName = (entry: BindingEntry): string | null => {
     const { name } = entry.importName;
@@ -87,6 +94,10 @@ const adviceFor = (source: string): string => {
         return ICON_ADVICE;
     }
 
+    if (parseFontSpecifier(source) !== null) {
+        return FONT_ADVICE;
+    }
+
     if (isUrlSpecifier(source)) {
         return QUERY_ADVICE;
     }
@@ -102,7 +113,7 @@ const unbackedBindingError = (path: string, binding: NamedBinding): Error =>
     );
 
 const isCheckedSource = (path: string): boolean => !path.startsWith(VIRTUAL_PREFIX) && !NODE_MODULES.test(path);
-const hasCheckedAssetMention = (code: string): boolean => ASSET_MENTION_RE.test(code) || code.includes("?url");
+const hasCheckedAssetMention = (code: string): boolean => ASSET_MENTION_RE.test(code) || code.includes(URL_QUERY);
 
 const checkAssetImports = (code: string, id: string): void => {
     const path = stripQuery(id);
@@ -130,8 +141,15 @@ function gtkxAssetImports(): Plugin {
         name: "gtkx:asset-imports",
         enforce: "pre",
 
-        transform(code, id) {
-            checkAssetImports(code, id);
+        transform: {
+            filter: {
+                id: { include: SOURCE_ID_RE, exclude: [VIRTUAL_ID_RE, NODE_MODULES_ID_RE] },
+                code: { include: [ASSET_MENTION_RE, URL_QUERY] },
+            },
+
+            handler(code, id) {
+                checkAssetImports(code, id);
+            },
         },
     };
 }

package/src/vite-plugins/asset-specifier.ts

@@ -11,9 +11,14 @@ type IconSpecifier = {
     iconName: string | null;
 };
 
+type FontSpecifier = {
+    assetSource: string;
+};
+
 const RELATIVE_PREFIX_RE = /^\.\.?(?:\/|$)/;
 const RESOURCE_QUERY_RE = /^resource(?:=([^&#]+))?$/;
 const ICON_QUERY_RE = /^icon(?:=([^&#]+))?$/;
+const FONT_QUERY_RE = /^font$/;
 const URL_QUERY_RE = /(?:^|&)url(?:&|$)/;
 
 const getQuery = (source: string): string | null => {
@@ -61,6 +66,17 @@ const parseIconSpecifier = (source: string): IconSpecifier | null => {
     return { assetSource, iconName: match[1] ?? null };
 };
 
+const parseFontSpecifier = (source: string): FontSpecifier | null => {
+    const query = getQuery(source);
+    const assetSource = stripQuery(source);
+
+    if (query === null || !ASSET_RE.test(assetSource) || !FONT_QUERY_RE.test(query)) {
+        return null;
+    }
+
+    return { assetSource };
+};
+
 const isUrlSpecifier = (source: string): boolean => {
     const query = getQuery(source);
 
@@ -71,6 +87,7 @@ export {
     isAssetSpecifier,
     isBareRelativeAsset,
     isUrlSpecifier,
+    parseFontSpecifier,
     parseIconSpecifier,
     parseResourceSpecifier,
 };

package/src/vite-plugins/build-manifest.ts

@@ -21,6 +21,11 @@ type ManifestState = {
     outDir: string;
 };
 
+type BuildConfigIdentity = {
+    configFile: string;
+    configDigest: string;
+};
+
 const PACKAGE_MANIFEST_FILENAME = "package.json";
 const DEFAULT_OUT_DIR = "dist";
 const JSON_INDENT = 4;
@@ -73,7 +78,7 @@ const packagesFor = (outDir: string, ids: string[]): RecordedPackage[] => {
 
 const renderManifest = (manifest: BuildManifest): string => `${JSON.stringify(manifest, null, JSON_INDENT)}\n`;
 
-function gtkxBuildManifest(root: string, collector: BuildManifestCollector): Plugin {
+function gtkxBuildManifest(root: string, collector: BuildManifestCollector, identity: BuildConfigIdentity): Plugin {
     const state: ManifestState = { outDir: join(root, DEFAULT_OUT_DIR) };
 
     return {
@@ -90,6 +95,7 @@ function gtkxBuildManifest(root: string, collector: BuildManifestCollector): Plu
             const manifest: BuildManifest = {
                 generator: BUILD_MANIFEST_GENERATOR,
                 formatVersion: BUILD_MANIFEST_FORMAT_VERSION,
+                ...identity,
                 schemas: collector.schemas,
                 packages: packagesFor(state.outDir, ids),
             };

package/src/vite-plugins/built-url.ts

@@ -68,8 +68,12 @@ function gtkxBuiltUrl(): Plugin {
             state.isBuild = config.command === "build";
         },
 
-        load(id) {
-            return loadDevFileUrl(this, state, id);
+        load: {
+            filter: { id: URL_QUERY_RE },
+
+            handler(id) {
+                return loadDevFileUrl(this, state, id);
+            },
         },
     };
 }

package/src/vite-plugins/css.ts

@@ -4,10 +4,12 @@ import { createVirtualNamespace } from "./virtual-module.js";
 
 type CssResolveContext = Parameters<typeof resolveToVirtual>[0];
 type CssResolveRequest = Parameters<typeof resolveToVirtual>[1];
+type CssLoadContext = { addWatchFile: (file: string) => void };
 
 const CSS_RE = /\.css$/i;
 const INJECT_SUFFIX = "?inject";
 const VIRTUAL_PREFIX = "\0gtkx-css:";
+const VIRTUAL_ID_RE = new RegExp(`^${VIRTUAL_PREFIX}`);
 const { isVirtual, fromVirtualId, resolveToVirtual } = createVirtualNamespace(VIRTUAL_PREFIX);
 
 const resolveCssId = async (ctx: CssResolveContext, request: CssResolveRequest): Promise<string | undefined> => {
@@ -24,13 +26,14 @@ const resolveCssId = async (ctx: CssResolveContext, request: CssResolveRequest):
     return virtualId + INJECT_SUFFIX;
 };
 
-const loadInjectedCss = (id: string): string | undefined => {
+const loadInjectedCss = (ctx: CssLoadContext, id: string): string | undefined => {
     if (!isVirtual(id) || !id.endsWith(INJECT_SUFFIX)) {
         return;
     }
 
     const filePath = fromVirtualId(id.slice(0, -INJECT_SUFFIX.length));
     const content = readFileSync(filePath, "utf8");
+    ctx.addWatchFile(filePath);
 
     return ["import { injectGlobal } from \"@gtkx/css\";", `injectGlobal(${JSON.stringify(content)});`].join("\n");
 };
@@ -40,12 +43,20 @@ function gtkxCss(): Plugin {
         name: "gtkx:css",
         enforce: "pre",
 
-        resolveId(source, importer, options) {
-            return resolveCssId(this, { source, importer, options });
+        resolveId: {
+            filter: { id: CSS_RE },
+
+            handler(source, importer, options) {
+                return resolveCssId(this, { source, importer, options });
+            },
         },
 
-        load(id) {
-            return loadInjectedCss(id);
+        load: {
+            filter: { id: VIRTUAL_ID_RE },
+
+            handler(id) {
+                return loadInjectedCss(this, id);
+            },
         },
     };
 }

package/src/vite-plugins/ensure-store.ts

@@ -3,11 +3,11 @@ import { ensureGenerated } from "../codegen/run-codegen.js";
 
 const TEST_MODE = "test";
 
-const gtkxEnsureStore = (): Plugin => ({
+const gtkxEnsureStore = (configFile?: string): Plugin => ({
     name: "gtkx:ensure-store",
 
     async config() {
-        await ensureGenerated(process.cwd(), { shouldAnnounce: true, mode: TEST_MODE });
+        await ensureGenerated(process.cwd(), { shouldAnnounce: true, mode: TEST_MODE, configFile });
     },
 });
 

package/src/vite-plugins/fast-refresh/refresh-filter.ts

@@ -3,6 +3,8 @@ const REFRESH_SIG = "$RefreshSig$";
 const REFRESH_RUNTIME_SPECIFIER = "@gtkx/cli/refresh-runtime";
 const REFRESH_INCLUDE = /\.[tj]sx?$/;
 const REFRESH_EXCLUDE = /node_modules|[/\\]dist[/\\]|[/\\]\.gtkx[/\\]/;
+const REFRESH_ID_FILTER = { include: REFRESH_INCLUDE, exclude: REFRESH_EXCLUDE };
+const REFRESH_RUNTIME_ID_RE = new RegExp(`^${REFRESH_RUNTIME_SPECIFIER}$`);
 
 const shouldTransformForRefresh = (
     id: string,
@@ -23,4 +25,11 @@ const shouldTransformForRefresh = (
     return true;
 };
 
-export { REFRESH_REG, REFRESH_SIG, REFRESH_RUNTIME_SPECIFIER, shouldTransformForRefresh };
+export {
+    REFRESH_ID_FILTER,
+    REFRESH_REG,
+    REFRESH_RUNTIME_ID_RE,
+    REFRESH_RUNTIME_SPECIFIER,
+    REFRESH_SIG,
+    shouldTransformForRefresh,
+};

package/src/vite-plugins/fast-refresh/swc-refresh.ts

@@ -1,7 +1,14 @@
 import type { Plugin } from "vite";
 import { type Output, type Options as SwcOptions, transform } from "@swc/core";
 import { fileURLToPath } from "node:url";
-import { REFRESH_REG, REFRESH_RUNTIME_SPECIFIER, REFRESH_SIG, shouldTransformForRefresh } from "./refresh-filter.js";
+import {
+    REFRESH_ID_FILTER,
+    REFRESH_REG,
+    REFRESH_RUNTIME_ID_RE,
+    REFRESH_RUNTIME_SPECIFIER,
+    REFRESH_SIG,
+    shouldTransformForRefresh,
+} from "./refresh-filter.js";
 
 const buildSwcOptions = (id: string): SwcOptions => {
     const isTsx = id.endsWith(".tsx");
@@ -55,14 +62,18 @@ function gtkxSwcRefresh(): Plugin {
         enforce: "pre",
         apply: "serve",
 
-        async transform(code, id, transformOptions) {
-            if (!shouldTransformForRefresh(id, transformOptions)) {
-                return;
-            }
+        transform: {
+            filter: { id: REFRESH_ID_FILTER },
 
-            const result = await transform(code, buildSwcOptions(id));
+            async handler(code, id, transformOptions) {
+                if (!shouldTransformForRefresh(id, transformOptions)) {
+                    return;
+                }
 
-            return buildRefreshResult(result);
+                const result = await transform(code, buildSwcOptions(id));
+
+                return buildRefreshResult(result);
+            },
         },
     };
 }
@@ -73,16 +84,24 @@ function gtkxRefreshRuntime(): Plugin {
         enforce: "post",
         apply: "serve",
 
-        resolveId(id) {
-            if (id !== REFRESH_RUNTIME_SPECIFIER) {
-                return;
-            }
+        resolveId: {
+            filter: { id: REFRESH_RUNTIME_ID_RE },
+
+            handler(id) {
+                if (id !== REFRESH_RUNTIME_SPECIFIER) {
+                    return;
+                }
 
-            return fileURLToPath(import.meta.resolve(REFRESH_RUNTIME_SPECIFIER));
+                return fileURLToPath(import.meta.resolve(REFRESH_RUNTIME_SPECIFIER));
+            },
         },
 
-        transform(code, id, transformOptions) {
-            return injectRefreshRegistration(code, id, transformOptions);
+        transform: {
+            filter: { id: REFRESH_ID_FILTER, code: { include: [REFRESH_REG, REFRESH_SIG] } },
+
+            handler(code, id, transformOptions) {
+                return injectRefreshRegistration(code, id, transformOptions);
+            },
         },
     };
 }