@gtkx/cli 2.0.0-beta.5 → 2.0.0-beta.7

package/src/internal/xdg-banner.ts

@@ -0,0 +1,13 @@
+import type { Rollup } from "vite";
+import { outputRootUrlExpression } from "./banner.js";
+import { XDG_DATA_DIRS_DEFAULT } from "./xdg-data-dirs.js";
+
+const xdgDataDirsBanner = (chunk: Rollup.RenderedChunk): string => [
+    "globalThis.process.env.XDG_DATA_DIRS = (() => {",
+    `    const root = ${outputRootUrlExpression(chunk)};`,
+    `    const dirs = globalThis.process.env.XDG_DATA_DIRS || ${JSON.stringify(XDG_DATA_DIRS_DEFAULT)};`,
+    "    return dirs.split(\":\").includes(root) ? dirs : `${root}:${dirs}`;",
+    "})();",
+].join("\n");
+
+export { xdgDataDirsBanner };

package/src/internal/xdg-data-dirs.ts

@@ -10,4 +10,4 @@ const prependXdgDataDir = (dir: string, existing: string | undefined): string =>
     return `${dir}:${base}`;
 };
 
-export { prependXdgDataDir };
+export { prependXdgDataDir, XDG_DATA_DIRS_DEFAULT };

package/src/settings/schema.ts

@@ -12,7 +12,7 @@ import {
 import { tmpdir } from "node:os";
 import { basename, dirname, join, relative, resolve } from "node:path";
 import { I18N_TYPES_FILENAME, i18nTypesPath } from "../i18n/types.js";
-import { discoverSourceImports, type SourceImport } from "../internal/source-imports.js";
+import { discoverSourceImports, sourceDirFor, type SourceImport } from "../internal/source-imports.js";
 import { removeTempDir } from "../internal/staging-dir.js";
 import {
     isBareRelativeAsset,
@@ -30,7 +30,6 @@ type SchemaEnvResult = {
 
 const SCHEMA_SUFFIX = ".gschema.xml";
 const STAGED_NAME_LENGTH = 16;
-const SOURCE_DIR = "src";
 const RESOURCE_QUERY = "?resource=";
 const ICON_QUERY = "?icon=";
 
@@ -69,12 +68,6 @@ const projectRelativeSchemaPath = (root: string, filePath: string): string | nul
 
 const getRelativeModuleSpecifier = (filePath: string): string => `*/${basename(filePath)}`;
 
-const sourceDirFor = (root: string): string => {
-    const sourceDir = join(root, SOURCE_DIR);
-
-    return existsSync(sourceDir) ? sourceDir : root;
-};
-
 const isRelativeImport = (source: string): boolean => source.startsWith("./") || source.startsWith("../");
 
 const schemaFileFor = ({ importer, source }: SourceImport): string | null =>

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

@@ -18,6 +18,8 @@ const ASSET_EXTENSIONS = [
     "eot",
     "ttf",
     "otf",
+    "ttc",
+    "otc",
     "ico",
     "avif",
     "data",

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

@@ -5,6 +5,7 @@ import { ASSET_MENTION_RE } from "./asset-extensions.js";
 import {
     isAssetSpecifier,
     isUrlSpecifier,
+    parseFontSpecifier,
     parseIconSpecifier,
     parseResourceSpecifier,
 } from "./asset-specifier.js";
@@ -31,8 +32,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 +91,10 @@ const adviceFor = (source: string): string => {
         return ICON_ADVICE;
     }
 
+    if (parseFontSpecifier(source) !== null) {
+        return FONT_ADVICE;
+    }
+
     if (isUrlSpecifier(source)) {
         return QUERY_ADVICE;
     }

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/css.ts

@@ -4,6 +4,7 @@ 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";
@@ -24,13 +25,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");
 };
@@ -45,7 +47,7 @@ function gtkxCss(): Plugin {
         },
 
         load(id) {
-            return loadInjectedCss(id);
+            return loadInjectedCss(this, id);
         },
     };
 }