@gtkx/config 1.0.0 → 1.2.0

package/src/schema-text.ts

@@ -0,0 +1,38 @@
+import { z } from "zod";
+
+const FILE_EXTENSION = /^[^\s./\\*?[\]]+(?:\.[^\s./\\*?[\]]+)*$/;
+const SEGMENT_SEPARATOR = /[/\\]/;
+
+const isRelativePath = (value: string): boolean => {
+    if (value.length === 0 || value.startsWith("/") || value.includes("\\")) {
+        return false;
+    }
+
+    return value.split(SEGMENT_SEPARATOR).every((part) => part !== "" && part !== "..");
+};
+
+const text = (message: string): z.ZodString => z.string({ error: message }).min(1, { error: message });
+
+const textList = (itemNoun: string, listMessage: string): z.ZodArray<z.ZodString> =>
+    z.array(text(`must be a non-empty ${itemNoun}`), { error: listMessage });
+
+const url = (message: string): z.ZodURL => z.url({ error: message });
+const flag = (message: string): z.ZodBoolean => z.boolean({ error: message });
+
+const textRecord = (valueMessage: string, recordMessage: string): z.ZodRecord<z.ZodString, z.ZodString> =>
+    z.record(z.string(), text(valueMessage), { error: recordMessage });
+
+const fileExtension = (message: string): z.ZodString =>
+    z.string({ error: message }).refine((value) => FILE_EXTENSION.test(value), { error: message });
+
+const relativePath = (message: string): z.ZodString =>
+    z.string({ error: message }).refine((value) => isRelativePath(value), { error: message });
+
+const relativePathRecord = (
+    keyMessage: string,
+    valueMessage: string,
+    recordMessage: string,
+): z.ZodRecord<z.ZodString, z.ZodString> =>
+    z.record(relativePath(keyMessage), text(valueMessage), { error: recordMessage });
+
+export { fileExtension, flag, relativePathRecord, text, textList, textRecord, url };

package/src/user-event-signals.ts

@@ -48,4 +48,4 @@ const resolveUserEventSignals = (overrides: Record<string, string[]> | undefined
     return resolved;
 };
 
-export { DEFAULT_USER_EVENT_SIGNALS, resolveUserEventSignals };
+export { resolveUserEventSignals };

package/src/vite-plugin.ts

@@ -32,8 +32,8 @@ const createConfigPlugin = (options: {
     name: string;
     /** Loader the configuration is resolved through, defaulting to a fresh caching loader. */
     loadConfig?: ConfigLoader;
-    /** Extra Vite configuration contributed from the plugin's `config` hook. */
-    config?: () => Omit<UserConfig, "plugins">;
+    /** Extra Vite configuration contributed from the plugin's `config` hook, given the user's own configuration. */
+    config?: (config: UserConfig) => Omit<UserConfig, "plugins">;
 }): Plugin => {
     const loadConfig = options.loadConfig ?? createConfigLoader();
     const state: PluginState = { root: undefined };
@@ -43,7 +43,7 @@ const createConfigPlugin = (options: {
         config(config: UserConfig) {
             state.root = config.root ?? state.root;
 
-            return options.config?.();
+            return options.config?.(config);
         },
         resolveId: (id: string) => resolveVirtualId(id),
         load: (id: string) => loadVirtualModule(id, loadConfig, state),