@gtkx/cli 1.3.0 → 1.5.0

package/src/vite-plugins/resource-init-module.ts

@@ -1,15 +1,33 @@
-import { BUNDLE_FILENAME, REFRESH_EXPORT } from "./resource-shared.js";
+import { REFRESH_EXPORT, REGISTER_REFRESH_EXPORT } from "./resource-shared.js";
 
-const buildInitModuleSource = (): string =>
+type InitModuleOptions = { isBuild: true; bundleReferenceId: string } |
+    { isBuild: false; devBundlePath: string };
+
+const refreshCallbackSource = (): string[] => [
+    "const refreshCallbacks = new Map();",
+    "",
+    `export function ${REGISTER_REFRESH_EXPORT}(key, callback) {`,
+    "    refreshCallbacks.set(key, callback);",
+    "    callback();",
+    "}",
+    "",
+    "function runRefreshCallbacks() {",
+    "    for (const callback of refreshCallbacks.values()) callback();",
+    "}",
+];
+
+const buildInitModuleSource = (bundleReferenceId: string): string =>
     [
-        "import { dirname, join } from \"node:path\";",
         "import { fileURLToPath } from \"node:url\";",
         "import { Resource, resourcesRegister } from \"@gtkx/gi/gio\";",
         "",
-        "const bundleDir = dirname(fileURLToPath(import.meta.url));",
-        `const resource = Resource.load(join(bundleDir, ${JSON.stringify(BUNDLE_FILENAME)}));`,
+        `const bundleLocation = import.meta.ROLLUP_FILE_URL_${bundleReferenceId};`,
+        "const bundlePath = bundleLocation.startsWith(\"file:\") ? fileURLToPath(bundleLocation) : bundleLocation;",
+        "const resource = Resource.load(bundlePath);",
         "resourcesRegister(resource);",
         "",
+        ...refreshCallbackSource(),
+        "",
         "export function ensureRegistered() {}",
         `export function ${REFRESH_EXPORT}() {}`,
     ].join("\n");
@@ -31,27 +49,38 @@ const devInitModuleSource = (bundlePath: string): string => {
         "    current = next;",
         "}",
         "",
+        "function unregister() {",
+        "    if (!current) return;",
+        "    resourcesUnregister(current);",
+        "    current = null;",
+        "    lastSig = \"\";",
+        "}",
+        "",
+        ...refreshCallbackSource(),
+        "",
         "export function ensureRegistered() {",
-        `    if (!existsSync(${bundlePathLiteral})) return;`,
+        `    if (!existsSync(${bundlePathLiteral})) {`,
+        "        unregister();",
+        "        return;",
+        "    }",
         `    const { size, mtimeMs } = statSync(${bundlePathLiteral});`,
         "    const sig = size + \":\" + mtimeMs;",
-        "    if (sig === lastSig) return;",
-        "    register();",
-        "    lastSig = sig;",
+        "    if (sig !== lastSig) {",
+        "        register();",
+        "        lastSig = sig;",
+        "    }",
         "}",
         "",
         "ensureRegistered();",
         "",
         `export function ${REFRESH_EXPORT}() {`,
-        `    if (!existsSync(${bundlePathLiteral})) return;`,
-        "    register();",
-        `    const { size, mtimeMs } = statSync(${bundlePathLiteral});`,
-        "    lastSig = size + \":\" + mtimeMs;",
+        "    ensureRegistered();",
+        "    runRefreshCallbacks();",
         "}",
     ].join("\n");
 };
 
-const renderInitModule = (options: { isBuild: boolean; devBundlePath: string }): string =>
-    options.isBuild ? buildInitModuleSource() : devInitModuleSource(options.devBundlePath);
+const renderInitModule = (options: InitModuleOptions): string =>
+    options.isBuild ? buildInitModuleSource(options.bundleReferenceId) : devInitModuleSource(options.devBundlePath);
 
 export { renderInitModule };

package/src/vite-plugins/resource-shared.ts

@@ -4,7 +4,9 @@ const VIRTUAL_PREFIX = "\0gtkx-resources:";
 const VIRTUAL_INIT = "\0gtkx-resources-init";
 const BUNDLE_FILENAME = "gtkx.gresource";
 const REL_SEPARATOR = "\0rel=";
+const ICON_NAME_SEPARATOR = "\0icon=";
 const REFRESH_EXPORT = "__refresh";
+const REGISTER_REFRESH_EXPORT = "__registerRefresh";
 const RESOURCE_PATH_EXPORT = "path";
 const { isVirtual, toVirtualId, fromVirtualId } = createVirtualNamespace(VIRTUAL_PREFIX);
 
@@ -33,7 +35,9 @@ export {
     VIRTUAL_INIT,
     BUNDLE_FILENAME,
     REL_SEPARATOR,
+    ICON_NAME_SEPARATOR,
     REFRESH_EXPORT,
+    REGISTER_REFRESH_EXPORT,
     RESOURCE_PATH_EXPORT,
     escapeXml,
     isVirtual,