@hanzogui/static 7.3.1 → 8.0.0

package/dist/check-dep-versions.cjs

@@ -275,7 +275,7 @@ const DEFAULT_DEP_TYPES = ["dependencies" /* dependencies */, "devDependencies"
 ];
 function check(path) {
   const options = {
-    includeDepPattern: ["gui", "react-native-web-lite", "react-native-web-internals"]
+    includeDepPattern: ["hanzogui", "react-native-web-lite", "react-native-web-internals"]
   };
   if (options && options.depType && options.depType.some(dt => !Object.keys(DEPENDENCY_TYPE).includes(dt))) {
     throw new Error(`Invalid depType provided. Choices are: ${Object.keys(DEPENDENCY_TYPE).join(", ")}.`);

package/dist/checkDeps.cjs

@@ -37,7 +37,7 @@ var DEPENDENCY_TYPE = /* @__PURE__ */(DEPENDENCY_TYPE2 => {
   DEPENDENCY_TYPE2["resolutions"] = "resolutions";
   return DEPENDENCY_TYPE2;
 })(DEPENDENCY_TYPE || {});
-const CRITICAL_PACKAGES = ["@hanzogui/web", "@hanzogui/core", "gui"];
+const CRITICAL_PACKAGES = ["@hanzogui/web", "@hanzogui/core", "hanzogui"];
 function checkDuplicateInstalls(root) {
   const nodeModules = (0, import_node_path.join)(root, "node_modules");
   if (!(0, import_node_fs.existsSync)(nodeModules)) return "";
@@ -64,7 +64,7 @@ function checkDuplicateInstalls(root) {
     }
   }
   if (duplicates.size === 0) return "";
-  const lines = ["Found duplicate gui installations in node_modules:", "", "This causes multiple runtime instances, which breaks theme/config detection.", ""];
+  const lines = ["Found duplicate hanzogui installations in node_modules:", "", "This causes multiple runtime instances, which breaks theme/config detection.", ""];
   for (const [pkg, locations] of duplicates) {
     lines.push(`  ${pkg}:`);
     for (const loc of locations) {
@@ -130,7 +130,7 @@ function checkBunLockDuplicates(lockPath) {
     const content = (0, import_node_fs.readFileSync)(lockPath, "utf8");
     const duplicates = /* @__PURE__ */new Map();
     const criticalSet = new Set(CRITICAL_PACKAGES);
-    const packagePattern = /["'](@hanzogui\/[\w-]+|gui)@([^"'\s,]+)["']/g;
+    const packagePattern = /["'](@hanzogui\/[\w-]+|hanzogui)@([^"'\s,]+)["']/g;
     let match;
     while ((match = packagePattern.exec(content)) !== null) {
       const name = match[1];
@@ -150,7 +150,7 @@ function checkYarnLockDuplicates(lockPath) {
     const content = (0, import_node_fs.readFileSync)(lockPath, "utf8");
     const duplicates = /* @__PURE__ */new Map();
     const criticalSet = new Set(CRITICAL_PACKAGES);
-    const entryPattern = /^"?(@hanzogui\/[\w-]+|gui)@[^":\n]+[":]?\s*$/gm;
+    const entryPattern = /^"?(@hanzogui\/[\w-]+|hanzogui)@[^":\n]+[":]?\s*$/gm;
     const versionPattern = /^\s+version\s+"([^"]+)"/gm;
     let entryMatch;
     while ((entryMatch = entryPattern.exec(content)) !== null) {
@@ -204,11 +204,11 @@ function formatLockfileDuplicates(duplicates, lockfileName) {
   }
   lines.push("");
   lines.push("Multiple versions cause duplicate runtime instances, breaking config/theme detection.");
-  lines.push("Fix: ensure all gui packages use the same version range, then dedupe.");
+  lines.push("Fix: ensure all hanzogui packages use the same version range, then dedupe.");
   return lines.join("\n");
 }
 function checkConfigExists(root) {
-  const configNames = ["gui.config.ts", "gui.config.tsx", "gui.config.js", "gui.config.mjs", "gui.config.cjs"];
+  const configNames = ["hanzogui.config.ts", "hanzogui.config.tsx", "hanzogui.config.js", "hanzogui.config.mjs", "hanzogui.config.cjs"];
   const searchDirs = [root, (0, import_node_path.join)(root, "src"), (0, import_node_path.join)(root, "app"), (0, import_node_path.join)(root, "config")];
   for (const dir of searchDirs) {
     for (const name of configNames) {
@@ -217,7 +217,7 @@ function checkConfigExists(root) {
       }
     }
   }
-  const buildConfigNames = ["gui.build.ts", "gui.build.js", "gui.build.mjs", "gui.build.cjs"];
+  const buildConfigNames = ["hanzogui.build.ts", "hanzogui.build.js", "hanzogui.build.mjs", "hanzogui.build.cjs"];
   for (const name of buildConfigNames) {
     const buildPath = (0, import_node_path.join)(root, name);
     if ((0, import_node_fs.existsSync)(buildPath)) {
@@ -235,8 +235,8 @@ function checkConfigExists(root) {
   if ((0, import_node_fs.existsSync)(pkgJsonPath)) {
     try {
       const pkg = JSON.parse((0, import_node_fs.readFileSync)(pkgJsonPath, "utf8"));
-      if (pkg.gui?.config) {
-        const configPath = (0, import_node_path.join)(root, pkg.gui.config);
+      if (pkg.hanzogui?.config) {
+        const configPath = (0, import_node_path.join)(root, pkg.hanzogui.config);
         if ((0, import_node_fs.existsSync)(configPath)) return "";
       }
     } catch {}
@@ -247,7 +247,7 @@ function checkConfigExists(root) {
       if (pkg.workspaces) return "";
     } catch {}
   }
-  return ["No gui.config file found.", "", "Gui requires a config file (e.g. gui.config.ts) that calls createGui().", `Without it, components will throw "Can't find Gui configuration" at runtime.`, "", "See: https://gui.dev/docs/core/configuration"].join("\n");
+  return ["No hanzogui.config file found.", "", "Gui requires a config file (e.g. hanzogui.config.ts) that calls createGui().", `Without it, components will throw "Can't find Gui configuration" at runtime.`, "", "See: https://hanzogui.dev/docs/core/configuration"].join("\n");
 }
 async function checkDeps(root) {
   const issues = [];

package/dist/constants.cjs

@@ -44,8 +44,8 @@ var import_find_cache_dir = __toESM(require("find-cache-dir"));
 const CSS_FILE_NAME = "__snack.css";
 const MEDIA_SEP = "_";
 const cacheDir = (0, import_find_cache_dir.default)({
-  name: "gui",
+  name: "hanzogui",
   create: true
 });
 const FAILED_EVAL = /* @__PURE__ */Symbol("failed_style_eval");
-const SHOULD_DEBUG = process.env.DEBUG === "*" || process.env.DEBUG?.startsWith("gui");
+const SHOULD_DEBUG = process.env.DEBUG === "*" || process.env.DEBUG?.startsWith("hanzogui");

package/dist/exports.cjs

@@ -26,6 +26,7 @@ __export(exports_exports, {
   clearFormatCache: () => import_detectModuleFormat.clearFormatCache,
   createExtractor: () => import_createExtractor.createExtractor,
   detectModuleFormat: () => import_detectModuleFormat.detectModuleFormat,
+  esbundleGuiConfig: () => import_bundle.esbundleGuiConfig,
   literalToAst: () => import_literalToAst.literalToAst
 });
 module.exports = __toCommonJS(exports_exports);
@@ -43,4 +44,5 @@ __reExport(exports_exports, require("./extractor/watchGuiConfig.cjs"), module.ex
 __reExport(exports_exports, require("./extractor/createLogger.cjs"), module.exports);
 __reExport(exports_exports, require("./registerRequire.cjs"), module.exports);
 var import_detectModuleFormat = require("./extractor/detectModuleFormat.cjs");
+var import_bundle = require("./extractor/bundle.cjs");
 __reExport(exports_exports, require("./getPragmaOptions.cjs"), module.exports);

package/dist/extractor/bundle.cjs

@@ -76,15 +76,25 @@ const esbuildIgnoreFilesRegex = new RegExp(`.(${dataExtensions.join("|")})$`, "i
 function getESBuildConfig({
   entryPoints,
   resolvePlatformSpecificEntries,
+  define: callerDefine,
   ...options
 }, platform, aliases) {
-  if (process.env.DEBUG?.startsWith("gui")) console.info(`Building`, entryPoints);
-  const resolvedEntryPoints = !resolvePlatformSpecificEntries ? entryPoints : entryPoints.map(import_loadGui.resolveWebOrNativeSpecificEntry);
+  if (process.env.DEBUG?.startsWith("hanzogui")) console.info(`Building`, entryPoints);
+  const resolvedEntryPoints = !resolvePlatformSpecificEntries ? entryPoints : entryPoints.map(entry => (0, import_loadGui.resolveWebOrNativeSpecificEntry)(entry, platform));
   const detectedFormat = options.format || detectEntryFormat(resolvedEntryPoints[0]);
   return {
     bundle: true,
     entryPoints: resolvedEntryPoints,
     format: detectedFormat,
+    define: {
+      ...(platform === "web" ? {
+        "process.env.GUI_TARGET": "\"web\"",
+        "process.env.EXPO_OS": "\"web\""
+      } : {
+        "process.env.GUI_TARGET": "\"native\""
+      }),
+      ...callerDefine
+    },
     ...(detectedFormat === "esm" ? {
       mainFields: ["module", "main"],
       banner: {
@@ -96,7 +106,7 @@ function getESBuildConfig({
     jsxFactory: "react",
     allowOverwrite: true,
     keepNames: true,
-    resolveExtensions: [...[".web.tsx", ".web.ts", ".web.jsx", ".web.js"], ".tsx", ".ts", ".jsx", ".js"],
+    resolveExtensions: [...(platform === "web" ? [".web.tsx", ".web.ts", ".web.jsx", ".web.js"] : [".native.tsx", ".native.ts", ".native.jsx", ".native.js"]), ".tsx", ".ts", ".jsx", ".js"],
     platform: "node",
     tsconfigRaw: {
       compilerOptions: {
@@ -131,7 +141,7 @@ function getESBuildConfig({
             modified = true;
           }
           if ((0, import_hasTopLevelAwait.hasTopLevelAwait)(contents, args.path)) {
-            if (process.env.DEBUG?.startsWith("gui")) console.info(`[gui] stubbing file with top-level await: ${args.path}`);
+            if (process.env.DEBUG?.startsWith("hanzogui")) console.info(`[hanzogui] stubbing file with top-level await: ${args.path}`);
             return {
               contents: `// stubbed - contains top-level await
 export default {}`,

package/dist/extractor/bundleConfig.cjs

@@ -68,7 +68,7 @@ const activeTempFiles = /* @__PURE__ */new Set();
 function getDynamicEvalOutfile(name, format, contents) {
   const ext = format === "esm" ? "mjs" : "cjs";
   const hash = (0, import_node_crypto.createHash)("sha1").update(name).update("\0").update(format).update("\0").update(contents).digest("hex").slice(0, 10);
-  return (0, import_node_path.join)(process.cwd(), ".gui", `dynamic-eval-${hash}-${(0, import_node_path.basename)(name)}.${ext}`);
+  return (0, import_node_path.join)(process.cwd(), ".hanzogui", `dynamic-eval-${hash}-${(0, import_node_path.basename)(name)}.${ext}`);
 }
 function getEsbuildStdinLoader(filePath) {
   if (filePath.endsWith(".tsx")) return "tsx";
@@ -141,8 +141,8 @@ const handleEsmFeaturesPlugin = {
         modified = true;
       }
       if ((0, import_hasTopLevelAwait.hasTopLevelAwait)(contents, args.path)) {
-        if (process.env.DEBUG?.startsWith("gui")) {
-          console.info(`[gui] stubbing file with top-level await: ${args.path}`);
+        if (process.env.DEBUG?.startsWith("hanzogui")) {
+          console.info(`[hanzogui] stubbing file with top-level await: ${args.path}`);
         }
         return {
           // Keep this as an ESM-shaped stub so esbuild doesn't inline a top-level
@@ -177,6 +177,7 @@ const esbuildOptionsWithPlugins = {
   plugins: [handleEsmFeaturesPlugin]
 };
 let currentBundle = null;
+let currentBundleKey = "";
 let isBundling = false;
 let lastBundle = null;
 const waitForBundle = /* @__PURE__ */new Set();
@@ -189,34 +190,45 @@ function hasBundledConfigChanged() {
 }
 let loadedConfig = null;
 const getLoadedConfig = () => loadedConfig;
+function getBundleKey(props) {
+  return JSON.stringify({
+    components: props.components,
+    config: props.config,
+    platform: props.platform
+  });
+}
 async function getBundledConfig(props, rebuild = false) {
+  const bundleKey = getBundleKey(props);
   if (isBundling) {
     await new Promise(res => {
       waitForBundle.add(res);
     });
-  } else if (!currentBundle || rebuild) {
+  }
+  if (!currentBundle || currentBundleKey !== bundleKey || rebuild) {
     return await bundleConfig(props);
   }
   return currentBundle;
 }
-global.guiLastLoaded ||= 0;
-function updateLastLoaded(config) {
-  global.guiLastLoaded = Date.now();
-  global.guiLastBundledConfig = config;
+global.hanzoguiLastLoaded ||= 0;
+function updateLastLoaded(config, bundleKey) {
+  global.hanzoguiLastLoaded = Date.now();
+  global.hanzoguiLastBundledConfig = config;
+  global.hanzoguiLastBundledConfigKey = bundleKey;
 }
 let hasBundledOnce = false;
 let hasLoggedBuild = false;
 async function bundleConfig(props) {
-  if (global.guiLastBundledConfig && Date.now() - global.guiLastLoaded < 3e3) {
-    return global.guiLastBundledConfig;
+  const bundleKey = getBundleKey(props);
+  if (global.hanzoguiLastBundledConfig && global.hanzoguiLastBundledConfigKey === bundleKey && Date.now() - global.hanzoguiLastLoaded < 3e3) {
+    return global.hanzoguiLastBundledConfig;
   }
   try {
     isBundling = true;
     const configEntry = props.config ? (0, import_getGuiConfigPathFromOptionsConfig.getGuiConfigPathFromOptionsConfig)(props.config) : "";
-    const tmpDir = (0, import_node_path.join)(process.cwd(), ".gui");
+    const tmpDir = (0, import_node_path.join)(process.cwd(), ".hanzogui");
     const configFormat = configEntry ? (0, import_detectModuleFormat.detectModuleFormat)(configEntry) : "cjs";
     const configExt = configFormat === "esm" ? ".mjs" : ".cjs";
-    const configOutPath = (0, import_node_path.join)(tmpDir, `gui.config${configExt}`);
+    const configOutPath = (0, import_node_path.join)(tmpDir, `hanzogui.config${configExt}`);
     const baseComponents = (props.components || []).filter(x => x !== "@hanzogui/core");
     const componentFormats = baseComponents.map(mod => {
       try {
@@ -231,7 +243,7 @@ async function bundleConfig(props) {
       const ext = componentFormats[i] === "esm" ? ".mjs" : ".cjs";
       return (0, import_node_path.join)(tmpDir, `${componentModule.split(import_node_path.sep).join("-").replace(/[^a-z0-9]+/gi, "")}-components.config${ext}`);
     });
-    if (process.env.NODE_ENV === "development" && process.env.DEBUG?.startsWith("gui")) {
+    if (process.env.NODE_ENV === "development" && process.env.DEBUG?.startsWith("hanzogui")) {
       console.info(`Building config entry`, configEntry);
     }
     let shouldBuild = !props.disableInitialBuild;
@@ -271,8 +283,8 @@ async function bundleConfig(props) {
       if (!hasLoggedBuild && !props["_skipBuildLog"]) {
         hasLoggedBuild = true;
         (0, import_cli_color.colorLog)(import_cli_color.Color.FgYellow, `
-  \u27A1 [gui] built config, components, prompt (${Date.now() - start}ms)`);
-        if (process.env.DEBUG?.startsWith("gui")) {
+  \u27A1 [hanzogui] built config, components, prompt (${Date.now() - start}ms)`);
+        if (process.env.DEBUG?.startsWith("hanzogui")) {
           (0, import_cli_color.colorLog)(import_cli_color.Color.Dim, `
           Config     .${import_node_path.sep}${(0, import_node_path.relative)(process.cwd(), configOutPath)}
           Components ${componentOutPaths.map(p => `.${import_node_path.sep}${(0, import_node_path.relative)(process.cwd(), p)}`).join("\n             ")}
@@ -306,7 +318,7 @@ async function bundleConfig(props) {
       throw new Error(`No config: ${config}`);
     }
     if (config._isProxyWorm) {
-      throw new Error(`Got a proxied config - likely a module loading error. Set DEBUG=gui for details.`);
+      throw new Error(`Got a proxied config - likely a module loading error. Set DEBUG=hanzogui for details.`);
     }
     loadedConfig = config;
     if (!config.parsed) {
@@ -328,25 +340,26 @@ async function bundleConfig(props) {
     for (const component of components) {
       component.moduleName = baseComponents[componentOutPaths.indexOf(component.moduleName)] || component.moduleName;
       if (!component.moduleName) {
-        if (process.env.DEBUG?.includes("gui") || process.env.IS_GUI_DEV) {
+        if (process.env.DEBUG?.includes("hanzogui") || process.env.IS_GUI_DEV) {
           console.warn(`\u26A0\uFE0F no module name found: ${component.moduleName} ${JSON.stringify(baseComponents)} in ${JSON.stringify(componentOutPaths)}`);
         }
       }
     }
-    if (process.env.NODE_ENV === "development" && process.env.DEBUG?.startsWith("gui")) {
+    if (process.env.NODE_ENV === "development" && process.env.DEBUG?.startsWith("hanzogui")) {
       console.info("Loaded components", components);
     }
     const res = {
       components,
       nameToPaths: {},
-      guiConfig: config
+      hanzoguiConfig: config
     };
     currentBundle = res;
-    updateLastLoaded(res);
+    currentBundleKey = bundleKey;
+    updateLastLoaded(res, bundleKey);
     return res;
   } catch (err) {
-    console.error(`Error bundling gui config: ${err?.message} (run with DEBUG=gui to see stack)`);
-    if (process.env.DEBUG?.includes("gui")) {
+    console.error(`Error bundling hanzogui config: ${err?.message} (run with DEBUG=hanzogui to see stack)`);
+    if (process.env.DEBUG?.includes("hanzogui")) {
       console.error(err.stack);
     }
   } finally {
@@ -357,7 +370,7 @@ async function bundleConfig(props) {
 }
 async function writeGuiCSS(outputCSS, config) {
   const flush = async () => {
-    (0, import_cli_color.colorLog)(import_cli_color.Color.FgYellow, `  \u27A1 [gui] output css: ${outputCSS}`);
+    (0, import_cli_color.colorLog)(import_cli_color.Color.FgYellow, `  \u27A1 [hanzogui] output css: ${outputCSS}`);
     await FS.writeFile(outputCSS, css);
   };
   const css = config.getCSS();
@@ -447,7 +460,7 @@ async function loadComponentsInner(props, forceExports = false) {
             loader: import_bundle.esbuildLoaderConfig
           });
         }
-        if (process.env.DEBUG === "gui") {
+        if (process.env.DEBUG === "hanzogui") {
           console.info(`loadModule`, loadModule, format);
         }
         let moduleResult;
@@ -480,7 +493,7 @@ async function loadComponentsInner(props, forceExports = false) {
       } catch (err) {
         console.info("babel err", err, writtenContents);
         writtenContents = fileContents;
-        if (process.env.DEBUG?.startsWith("gui")) {
+        if (process.env.DEBUG?.startsWith("hanzogui")) {
           console.info(`Error parsing babel likely`, err);
         }
         try {
@@ -568,7 +581,7 @@ function loadComponentsInnerSync(props, forceExports = false) {
             loader: import_bundle.esbuildLoaderConfig
           });
         }
-        if (process.env.DEBUG === "gui") {
+        if (process.env.DEBUG === "hanzogui") {
           console.info(`loadModule`, loadModule, require.resolve(loadModule));
         }
         const moduleResult = require(loadModule);
@@ -596,7 +609,7 @@ function loadComponentsInnerSync(props, forceExports = false) {
       } catch (err) {
         console.info("babel err", err, writtenContents);
         writtenContents = fileContents;
-        if (process.env.DEBUG?.startsWith("gui")) {
+        if (process.env.DEBUG?.startsWith("hanzogui")) {
           console.info(`Error parsing babel likely`, err);
         }
       } finally {

package/dist/extractor/concatClassName.cjs

@@ -53,13 +53,12 @@ function concatClassName(_cn) {
         final = name + " " + final;
         continue;
       }
-      const nextChar = name[splitIndex + 1];
-      const isMediaQuery = nextChar === "_";
       const styleKey = name.slice(1, name.indexOf("-"));
-      const mediaStart = splitIndex + 2;
-      const mediaEnd = name.indexOf("_", mediaStart);
-      const mediaKey = isMediaQuery && mediaEnd > mediaStart ? name.slice(mediaStart, mediaEnd) : null;
-      const uid = mediaKey ? styleKey + mediaKey : styleKey;
+      const {
+        mediaKey,
+        pseudoKey
+      } = getClassNameScope(name, splitIndex);
+      const uid = `${styleKey}${mediaKey ? `@${mediaKey}` : ""}${pseudoKey ? `:${pseudoKey}` : ""}`;
       if (usedPrefixes.has(uid)) {
         continue;
       }
@@ -67,8 +66,8 @@ function concatClassName(_cn) {
       const propName = styleKey;
       if (propName && propObjects) {
         if (propObjects.some(po => {
-          if (mediaKey) {
-            const propKey = pseudoInvert[mediaKey];
+          if (pseudoKey) {
+            const propKey = pseudoInvert[pseudoKey];
             return po && po[propKey] && propName in po[propKey] && po[propKey] !== null;
           }
           const res = po && propName in po && po[propName] !== null;
@@ -82,11 +81,41 @@ function concatClassName(_cn) {
   }
   return final.trim();
 }
+function getClassNameScope(name, splitIndex) {
+  let mediaKey = "";
+  let pseudoKey = "";
+  let valueStart = splitIndex + 1;
+  if (name[valueStart] === "_") {
+    const mediaEnd = name.indexOf("_", valueStart + 1);
+    if (mediaEnd > valueStart + 1) {
+      mediaKey = name.slice(valueStart + 1, mediaEnd);
+      valueStart = mediaEnd + 1;
+    }
+  }
+  if (name[valueStart] === "0") {
+    const pseudoStart = valueStart + 1;
+    for (const nextPseudoKey of pseudoKeys) {
+      if (name.startsWith(`${nextPseudoKey}-`, pseudoStart)) {
+        pseudoKey = nextPseudoKey;
+        break;
+      }
+    }
+  }
+  return {
+    mediaKey,
+    pseudoKey
+  };
+}
 const pseudoInvert = {
   hover: "hoverStyle",
+  active: "pressStyle",
   focus: "focusStyle",
-  press: "pressStyle",
+  "focus-visible": "focusVisibleStyle",
+  "focus-within": "focusWithinStyle",
   focusVisible: "focusVisibleStyle",
   focusWithin: "focusWithinStyle",
-  disabled: "disabledStyle"
-};
+  disabled: "disabledStyle",
+  enter: "enterStyle",
+  exit: "exitStyle"
+};
+const pseudoKeys = Object.keys(pseudoInvert).sort((a, b) => b.length - a.length);