@gtkx/css 1.4.0 → 1.5.0

package/README.md

@@ -98,7 +98,7 @@ GTK4 is mature, and GtkBuilder XML can lay out a static interface, but nothing r
 - a React reconciler that exposes every GObject as a JSX element,
 - a CLI for scaffolding, development, and production builds,
 - a dev server with Fast Refresh that patches your running UI in place,
-- CSS-in-JS styling, React Spring animations, React Navigation stack, tab, drawer, and split view navigators, and high-level list, grid, and dialog components,
+- CSS-in-JS styling, React Hook Form-powered Adwaita controls, gettext-backed react-i18next localization, React Spring animations, React Navigation stack, tab, drawer, and split view navigators, and high-level list, grid, and dialog components,
 - a Testing Library-style API for querying and driving your widgets in tests,
 - and a Model Context Protocol (MCP) server that exposes your live app to AI agents.
 

package/dist/self-contained.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"self-contained.d.ts","sourceRoot":"","sources":["../src/self-contained.ts"],"names":[],"mappings":"AA6CA,QAAA,MAAM,kBAAkB,GAAI,MAAM,MAAM,KAAG,MAAM,GAAG,IAQnD,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"self-contained.d.ts","sourceRoot":"","sources":["../src/self-contained.ts"],"names":[],"mappings":"AA4CA,QAAA,MAAM,kBAAkB,GAAI,MAAM,MAAM,KAAG,MAAM,GAAG,IACyB,CAAC;AAE9E,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/self-contained.js

@@ -1,6 +1,5 @@
 import { CssProvider } from "@gtkx/gi/gtk";
 import { randomBytes } from "node:crypto";
-import { brokenToken } from "./tokens.js";
 const PROBE_BYTES = 16;
 const PROBE_RULE = `.gtkx-probe-${randomBytes(PROBE_BYTES).toString("hex")}{color:rgb(0, 0, 0);}`;
 const SWALLOWS_WHAT_FOLLOWS = "would disable every rule after it";
@@ -28,12 +27,6 @@ const hasProbe = (serialized) => {
     const ruleset = probe();
     return ruleset.length > 0 && `\n${serialized}`.includes(`\n${ruleset}`);
 };
-const containmentFailure = (rule) => {
-    const broken = brokenToken(rule);
-    if (broken !== null) {
-        return broken;
-    }
-    return hasProbe(parsed(`${rule}\n${PROBE_RULE}`)) ? null : SWALLOWS_WHAT_FOLLOWS;
-};
+const containmentFailure = (rule) => hasProbe(parsed(`${rule}\n${PROBE_RULE}`)) ? null : SWALLOWS_WHAT_FOLLOWS;
 export { containmentFailure };
 //# sourceMappingURL=self-contained.js.map

package/dist/self-contained.js.map

@@ -1 +1 @@
-{"version":3,"file":"self-contained.js","sourceRoot":"","sources":["../src/self-contained.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI1C,MAAM,WAAW,GAAG,EAAE,CAAC;AACvB,MAAM,UAAU,GAAG,eAAe,WAAW,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,uBAAuB,CAAC;AAClG,MAAM,qBAAqB,GAAG,mCAAmC,CAAC;AAClE,MAAM,IAAI,GAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAErD,MAAM,kBAAkB,GAAG,GAAc,EAAE,CAAC,SAAS,CAAC;AAEtD,MAAM,mBAAmB,GAAG,GAAgB,EAAE;IAC1C,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;IACnC,QAAQ,CAAC,EAAE,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;IAEjD,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,KAAK,GAAG,GAAgB,EAAE;IAC5B,IAAI,CAAC,QAAQ,KAAK,mBAAmB,EAAE,CAAC;IAExC,OAAO,IAAI,CAAC,QAAQ,CAAC;AACzB,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,CAAC,QAAgB,EAAU,EAAE;IACxC,MAAM,QAAQ,GAAG,KAAK,EAAE,CAAC;IACzB,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAElC,OAAO,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,KAAK,GAAG,GAAW,EAAE;IACvB,IAAI,CAAC,OAAO,KAAK,MAAM,CAAC,UAAU,CAAC,CAAC;IAEpC,OAAO,IAAI,CAAC,OAAO,CAAC;AACxB,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,UAAkB,EAAW,EAAE;IAC7C,MAAM,OAAO,GAAG,KAAK,EAAE,CAAC;IAExB,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC,QAAQ,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC;AAC5E,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAiB,EAAE;IACvD,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IAEjC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClB,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,OAAO,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,KAAK,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC;AACrF,CAAC,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC","sourcesContent":["import { CssProvider } from \"@gtkx/gi/gtk\";\nimport { randomBytes } from \"node:crypto\";\nimport { brokenToken } from \"./tokens.js\";\n\ntype Gate = { provider: CssProvider | null; ruleset: string | null };\n\nconst PROBE_BYTES = 16;\nconst PROBE_RULE = `.gtkx-probe-${randomBytes(PROBE_BYTES).toString(\"hex\")}{color:rgb(0, 0, 0);}`;\nconst SWALLOWS_WHAT_FOLLOWS = \"would disable every rule after it\";\nconst gate: Gate = { provider: null, ruleset: null };\n\nconst ignoreParsingError = (): undefined => undefined;\n\nconst createQuietProvider = (): CssProvider => {\n    const provider = new CssProvider();\n    provider.on(\"parsing-error\", ignoreParsingError);\n\n    return provider;\n};\n\nconst quiet = (): CssProvider => {\n    gate.provider ??= createQuietProvider();\n\n    return gate.provider;\n};\n\nconst parsed = (document: string): string => {\n    const provider = quiet();\n    provider.loadFromString(document);\n\n    return provider.toString();\n};\n\nconst probe = (): string => {\n    gate.ruleset ??= parsed(PROBE_RULE);\n\n    return gate.ruleset;\n};\n\nconst hasProbe = (serialized: string): boolean => {\n    const ruleset = probe();\n\n    return ruleset.length > 0 && `\\n${serialized}`.includes(`\\n${ruleset}`);\n};\n\nconst containmentFailure = (rule: string): string | null => {\n    const broken = brokenToken(rule);\n\n    if (broken !== null) {\n        return broken;\n    }\n\n    return hasProbe(parsed(`${rule}\\n${PROBE_RULE}`)) ? null : SWALLOWS_WHAT_FOLLOWS;\n};\n\nexport { containmentFailure };\n"]}
+{"version":3,"file":"self-contained.js","sourceRoot":"","sources":["../src/self-contained.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI1C,MAAM,WAAW,GAAG,EAAE,CAAC;AACvB,MAAM,UAAU,GAAG,eAAe,WAAW,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,uBAAuB,CAAC;AAClG,MAAM,qBAAqB,GAAG,mCAAmC,CAAC;AAClE,MAAM,IAAI,GAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAErD,MAAM,kBAAkB,GAAG,GAAc,EAAE,CAAC,SAAS,CAAC;AAEtD,MAAM,mBAAmB,GAAG,GAAgB,EAAE;IAC1C,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;IACnC,QAAQ,CAAC,EAAE,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;IAEjD,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,KAAK,GAAG,GAAgB,EAAE;IAC5B,IAAI,CAAC,QAAQ,KAAK,mBAAmB,EAAE,CAAC;IAExC,OAAO,IAAI,CAAC,QAAQ,CAAC;AACzB,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,CAAC,QAAgB,EAAU,EAAE;IACxC,MAAM,QAAQ,GAAG,KAAK,EAAE,CAAC;IACzB,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAElC,OAAO,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,KAAK,GAAG,GAAW,EAAE;IACvB,IAAI,CAAC,OAAO,KAAK,MAAM,CAAC,UAAU,CAAC,CAAC;IAEpC,OAAO,IAAI,CAAC,OAAO,CAAC;AACxB,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,UAAkB,EAAW,EAAE;IAC7C,MAAM,OAAO,GAAG,KAAK,EAAE,CAAC;IAExB,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC,QAAQ,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC;AAC5E,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAiB,EAAE,CACvD,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,KAAK,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC;AAE9E,OAAO,EAAE,kBAAkB,EAAE,CAAC","sourcesContent":["import { CssProvider } from \"@gtkx/gi/gtk\";\nimport { randomBytes } from \"node:crypto\";\n\ntype Gate = { provider: CssProvider | null; ruleset: string | null };\n\nconst PROBE_BYTES = 16;\nconst PROBE_RULE = `.gtkx-probe-${randomBytes(PROBE_BYTES).toString(\"hex\")}{color:rgb(0, 0, 0);}`;\nconst SWALLOWS_WHAT_FOLLOWS = \"would disable every rule after it\";\nconst gate: Gate = { provider: null, ruleset: null };\n\nconst ignoreParsingError = (): undefined => undefined;\n\nconst createQuietProvider = (): CssProvider => {\n    const provider = new CssProvider();\n    provider.on(\"parsing-error\", ignoreParsingError);\n\n    return provider;\n};\n\nconst quiet = (): CssProvider => {\n    gate.provider ??= createQuietProvider();\n\n    return gate.provider;\n};\n\nconst parsed = (document: string): string => {\n    const provider = quiet();\n    provider.loadFromString(document);\n\n    return provider.toString();\n};\n\nconst probe = (): string => {\n    gate.ruleset ??= parsed(PROBE_RULE);\n\n    return gate.ruleset;\n};\n\nconst hasProbe = (serialized: string): boolean => {\n    const ruleset = probe();\n\n    return ruleset.length > 0 && `\\n${serialized}`.includes(`\\n${ruleset}`);\n};\n\nconst containmentFailure = (rule: string): string | null =>\n    hasProbe(parsed(`${rule}\\n${PROBE_RULE}`)) ? null : SWALLOWS_WHAT_FOLLOWS;\n\nexport { containmentFailure };\n"]}

package/dist/stylesheet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stylesheet.d.ts","sourceRoot":"","sources":["../src/stylesheet.ts"],"names":[],"mappings":"AAUA,cAAM,UAAU;IACZ,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,eAAe,CAAS;IAEhC,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,cAAc;IAatB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;CAY7B;AAED,OAAO,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"stylesheet.d.ts","sourceRoot":"","sources":["../src/stylesheet.ts"],"names":[],"mappings":"AAiBA,cAAM,UAAU;IACZ,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,eAAe,CAAS;IAEhC,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,cAAc;IAatB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;CAY7B;AAED,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/dist/stylesheet.js

@@ -2,8 +2,14 @@ import { createLogger } from "@gtkx/utils";
 import { attachParsingErrorLogger, registerProviderForDefaultDisplay } from "./provider.js";
 import { hasNul, NUL_REASON, printableRule } from "./rule-text.js";
 import { containmentFailure } from "./self-contained.js";
+import { hasNewlineInString, NEWLINE_IN_STRING } from "./tokens.js";
 const log = createLogger("css");
-const unusableReason = (rule) => (hasNul(rule) ? NUL_REASON : containmentFailure(rule));
+const unusableReason = (rule) => {
+    if (hasNul(rule)) {
+        return NUL_REASON;
+    }
+    return hasNewlineInString(rule) ? NEWLINE_IN_STRING : containmentFailure(rule);
+};
 class StyleSheet {
     css = "";
     provider = null;

package/dist/stylesheet.js.map

@@ -1 +1 @@
-{"version":3,"file":"stylesheet.js","sourceRoot":"","sources":["../src/stylesheet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,wBAAwB,EAAE,iCAAiC,EAAE,MAAM,eAAe,CAAC;AAC5F,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,GAAG,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;AAEhC,MAAM,cAAc,GAAG,CAAC,IAAY,EAAiB,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;AAE/G,MAAM,UAAU;IACJ,GAAG,GAAG,EAAE,CAAC;IACT,QAAQ,GAA2B,IAAI,CAAC;IACxC,eAAe,GAAG,KAAK,CAAC;IAExB,cAAc;QAClB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;QACzB,CAAC;QAED,MAAM,QAAQ,GAAG,iCAAiC,EAAE,CAAC;QACrD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,wBAAwB,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;QAE/C,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEO,cAAc;QAClB,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACvB,OAAO;QACX,CAAC;QAED,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAE5B,cAAc,CAAC,GAAG,EAAE;YAChB,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;YAC7B,IAAI,CAAC,cAAc,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,IAAY;QACf,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QAEpC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAClB,GAAG,CAAC,IAAI,CAAC,qCAAqC,MAAM,KAAK,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAEhF,OAAO;QACX,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACrD,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;CACJ;AAED,OAAO,EAAE,UAAU,EAAE,CAAC","sourcesContent":["import type * as Gtk from \"@gtkx/gi/gtk\";\nimport { createLogger } from \"@gtkx/utils\";\nimport { attachParsingErrorLogger, registerProviderForDefaultDisplay } from \"./provider.js\";\nimport { hasNul, NUL_REASON, printableRule } from \"./rule-text.js\";\nimport { containmentFailure } from \"./self-contained.js\";\n\nconst log = createLogger(\"css\");\n\nconst unusableReason = (rule: string): string | null => (hasNul(rule) ? NUL_REASON : containmentFailure(rule));\n\nclass StyleSheet {\n    private css = \"\";\n    private provider: Gtk.CssProvider | null = null;\n    private updateScheduled = false;\n\n    private ensureProvider(): Gtk.CssProvider {\n        if (this.provider) {\n            return this.provider;\n        }\n\n        const provider = registerProviderForDefaultDisplay();\n        this.provider = provider;\n        attachParsingErrorLogger(provider, log, \"CSS\");\n\n        return provider;\n    }\n\n    private scheduleUpdate(): void {\n        if (this.updateScheduled) {\n            return;\n        }\n\n        this.updateScheduled = true;\n\n        queueMicrotask(() => {\n            this.updateScheduled = false;\n            this.ensureProvider().loadFromString(this.css);\n        });\n    }\n\n    insert(rule: string): void {\n        const reason = unusableReason(rule);\n\n        if (reason !== null) {\n            log.warn(`Dropped a malformed CSS rule that ${reason}: ${printableRule(rule)}`);\n\n            return;\n        }\n\n        this.css += this.css.length > 0 ? `\\n${rule}` : rule;\n        this.scheduleUpdate();\n    }\n}\n\nexport { StyleSheet };\n"]}
+{"version":3,"file":"stylesheet.js","sourceRoot":"","sources":["../src/stylesheet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,wBAAwB,EAAE,iCAAiC,EAAE,MAAM,eAAe,CAAC;AAC5F,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEpE,MAAM,GAAG,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;AAEhC,MAAM,cAAc,GAAG,CAAC,IAAY,EAAiB,EAAE;IACnD,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACf,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;AACnF,CAAC,CAAC;AAEF,MAAM,UAAU;IACJ,GAAG,GAAG,EAAE,CAAC;IACT,QAAQ,GAA2B,IAAI,CAAC;IACxC,eAAe,GAAG,KAAK,CAAC;IAExB,cAAc;QAClB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;QACzB,CAAC;QAED,MAAM,QAAQ,GAAG,iCAAiC,EAAE,CAAC;QACrD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,wBAAwB,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;QAE/C,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEO,cAAc;QAClB,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACvB,OAAO;QACX,CAAC;QAED,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAE5B,cAAc,CAAC,GAAG,EAAE;YAChB,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;YAC7B,IAAI,CAAC,cAAc,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,IAAY;QACf,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QAEpC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAClB,GAAG,CAAC,IAAI,CAAC,qCAAqC,MAAM,KAAK,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAEhF,OAAO;QACX,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACrD,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;CACJ;AAED,OAAO,EAAE,UAAU,EAAE,CAAC","sourcesContent":["import type * as Gtk from \"@gtkx/gi/gtk\";\nimport { createLogger } from \"@gtkx/utils\";\nimport { attachParsingErrorLogger, registerProviderForDefaultDisplay } from \"./provider.js\";\nimport { hasNul, NUL_REASON, printableRule } from \"./rule-text.js\";\nimport { containmentFailure } from \"./self-contained.js\";\nimport { hasNewlineInString, NEWLINE_IN_STRING } from \"./tokens.js\";\n\nconst log = createLogger(\"css\");\n\nconst unusableReason = (rule: string): string | null => {\n    if (hasNul(rule)) {\n        return NUL_REASON;\n    }\n\n    return hasNewlineInString(rule) ? NEWLINE_IN_STRING : containmentFailure(rule);\n};\n\nclass StyleSheet {\n    private css = \"\";\n    private provider: Gtk.CssProvider | null = null;\n    private updateScheduled = false;\n\n    private ensureProvider(): Gtk.CssProvider {\n        if (this.provider) {\n            return this.provider;\n        }\n\n        const provider = registerProviderForDefaultDisplay();\n        this.provider = provider;\n        attachParsingErrorLogger(provider, log, \"CSS\");\n\n        return provider;\n    }\n\n    private scheduleUpdate(): void {\n        if (this.updateScheduled) {\n            return;\n        }\n\n        this.updateScheduled = true;\n\n        queueMicrotask(() => {\n            this.updateScheduled = false;\n            this.ensureProvider().loadFromString(this.css);\n        });\n    }\n\n    insert(rule: string): void {\n        const reason = unusableReason(rule);\n\n        if (reason !== null) {\n            log.warn(`Dropped a malformed CSS rule that ${reason}: ${printableRule(rule)}`);\n\n            return;\n        }\n\n        this.css += this.css.length > 0 ? `\\n${rule}` : rule;\n        this.scheduleUpdate();\n    }\n}\n\nexport { StyleSheet };\n"]}

package/dist/tokens.d.ts

@@ -1,3 +1,4 @@
-declare const brokenToken: (text: string) => string | null;
-export { brokenToken };
+declare const NEWLINE_IN_STRING = "carries a newline inside a string";
+declare const hasNewlineInString: (rule: string) => boolean;
+export { hasNewlineInString, NEWLINE_IN_STRING };
 //# sourceMappingURL=tokens.d.ts.map

package/dist/tokens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AA2FA,QAAA,MAAM,WAAW,GAAI,MAAM,MAAM,KAAG,MAAM,GAAG,IAc5C,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,iBAAiB,sCAAsC,CAAC;AA6B9D,QAAA,MAAM,kBAAkB,GAAI,MAAM,MAAM,KAAG,OAY1C,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/tokens.js

@@ -1,77 +1,34 @@
-const UNTERMINATED = "leaves a string, comment or url unterminated";
 const NEWLINE_IN_STRING = "carries a newline inside a string";
 const ESCAPE = "\\";
-const NEWLINE = "\n";
-const CLOSE_PAREN = ")";
-const COMMENT_OPEN = "/*";
-const COMMENT_CLOSE = "*/";
-const URL_OPEN = "url(";
+const CRLF = "\r\n";
 const QUOTES = new Set(['"', "'"]);
-const URL_TOKEN = /url\(/iy;
-const QUOTED_URL = /url\([\t\n\f\r ]*["']/iy;
-const hasMatchAt = (pattern, text, index) => {
-    pattern.lastIndex = index;
-    return pattern.test(text);
-};
-const isUrlStart = (text, index) => hasMatchAt(URL_TOKEN, text, index) && !hasMatchAt(QUOTED_URL, text, index);
-const took = (index) => ({ index, reason: null });
-const broke = (index, reason) => ({ index, reason });
-const stepped = (text, index) => index + (text.charAt(index) === ESCAPE ? 2 : 1);
-const endOfString = (text, index, quote) => {
-    const char = text.charAt(index);
-    if (char === quote) {
-        return took(index + 1);
-    }
-    return char === NEWLINE ? broke(index + 1, NEWLINE_IN_STRING) : null;
-};
-const readString = (text, start, quote) => {
-    let index = start;
-    while (index < text.length) {
-        const end = endOfString(text, index, quote);
-        if (end !== null) {
-            return end;
-        }
-        index = stepped(text, index);
-    }
-    return broke(index, UNTERMINATED);
-};
-const readComment = (text, start) => {
-    const end = text.indexOf(COMMENT_CLOSE, start);
-    return end === -1 ? broke(text.length, UNTERMINATED) : took(end + COMMENT_CLOSE.length);
-};
-const readUrl = (text, start) => {
-    let index = start;
-    while (index < text.length) {
-        if (text.charAt(index) === CLOSE_PAREN) {
-            return took(index + 1);
-        }
-        index = stepped(text, index);
-    }
-    return broke(index, UNTERMINATED);
-};
-const readNext = (text, index) => {
-    const char = text.charAt(index);
+const NEWLINES = new Set(["\n", "\r", "\f"]);
+const AFTER_ESCAPE = 2;
+const AFTER_ESCAPED_CRLF = 3;
+const skipEscape = (rule, index) => index + (rule.startsWith(CRLF, index + 1) ? AFTER_ESCAPED_CRLF : AFTER_ESCAPE);
+const stepped = (rule, scan) => {
+    const char = rule.charAt(scan.index);
     if (char === ESCAPE) {
-        return took(index + 2);
-    }
-    if (QUOTES.has(char)) {
-        return readString(text, index + 1, char);
+        return { index: skipEscape(rule, scan.index), quote: scan.quote, broken: false };
     }
-    if (text.startsWith(COMMENT_OPEN, index)) {
-        return readComment(text, index + COMMENT_OPEN.length);
+    if (scan.quote === null) {
+        return { index: scan.index + 1, quote: QUOTES.has(char) ? char : null, broken: false };
     }
-    return isUrlStart(text, index) ? readUrl(text, index + URL_OPEN.length) : took(index + 1);
+    return {
+        index: scan.index + 1,
+        quote: char === scan.quote ? null : scan.quote,
+        broken: NEWLINES.has(char),
+    };
 };
-const brokenToken = (text) => {
-    let index = 0;
-    while (index < text.length) {
-        const step = readNext(text, index);
-        if (step.reason !== null) {
-            return step.reason;
+const hasNewlineInString = (rule) => {
+    let scan = { index: 0, quote: null, broken: false };
+    while (scan.index < rule.length) {
+        scan = stepped(rule, scan);
+        if (scan.broken) {
+            return true;
         }
-        index = step.index;
     }
-    return null;
+    return false;
 };
-export { brokenToken };
+export { hasNewlineInString, NEWLINE_IN_STRING };
 //# sourceMappingURL=tokens.js.map

package/dist/tokens.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"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","sourcesContent":["type Step = { index: number; reason: string | null };\n\nconst UNTERMINATED = \"leaves a string, comment or url unterminated\";\nconst NEWLINE_IN_STRING = \"carries a newline inside a string\";\nconst ESCAPE = \"\\\\\";\nconst NEWLINE = \"\\n\";\nconst CLOSE_PAREN = \")\";\nconst COMMENT_OPEN = \"/*\";\nconst COMMENT_CLOSE = \"*/\";\nconst URL_OPEN = \"url(\";\nconst QUOTES = new Set(['\"', \"'\"]);\nconst URL_TOKEN = /url\\(/iy;\nconst QUOTED_URL = /url\\([\\t\\n\\f\\r ]*[\"']/iy;\n\nconst hasMatchAt = (pattern: RegExp, text: string, index: number): boolean => {\n    pattern.lastIndex = index;\n\n    return pattern.test(text);\n};\n\nconst isUrlStart = (text: string, index: number): boolean =>\n    hasMatchAt(URL_TOKEN, text, index) && !hasMatchAt(QUOTED_URL, text, index);\n\nconst took = (index: number): Step => ({ index, reason: null });\nconst broke = (index: number, reason: string): Step => ({ index, reason });\nconst stepped = (text: string, index: number): number => index + (text.charAt(index) === ESCAPE ? 2 : 1);\n\nconst endOfString = (text: string, index: number, quote: string): Step | null => {\n    const char = text.charAt(index);\n\n    if (char === quote) {\n        return took(index + 1);\n    }\n\n    return char === NEWLINE ? broke(index + 1, NEWLINE_IN_STRING) : null;\n};\n\nconst readString = (text: string, start: number, quote: string): Step => {\n    let index = start;\n\n    while (index < text.length) {\n        const end = endOfString(text, index, quote);\n\n        if (end !== null) {\n            return end;\n        }\n\n        index = stepped(text, index);\n    }\n\n    return broke(index, UNTERMINATED);\n};\n\nconst readComment = (text: string, start: number): Step => {\n    const end = text.indexOf(COMMENT_CLOSE, start);\n\n    return end === -1 ? broke(text.length, UNTERMINATED) : took(end + COMMENT_CLOSE.length);\n};\n\nconst readUrl = (text: string, start: number): Step => {\n    let index = start;\n\n    while (index < text.length) {\n        if (text.charAt(index) === CLOSE_PAREN) {\n            return took(index + 1);\n        }\n\n        index = stepped(text, index);\n    }\n\n    return broke(index, UNTERMINATED);\n};\n\nconst readNext = (text: string, index: number): Step => {\n    const char = text.charAt(index);\n\n    if (char === ESCAPE) {\n        return took(index + 2);\n    }\n\n    if (QUOTES.has(char)) {\n        return readString(text, index + 1, char);\n    }\n\n    if (text.startsWith(COMMENT_OPEN, index)) {\n        return readComment(text, index + COMMENT_OPEN.length);\n    }\n\n    return isUrlStart(text, index) ? readUrl(text, index + URL_OPEN.length) : took(index + 1);\n};\n\nconst brokenToken = (text: string): string | null => {\n    let index = 0;\n\n    while (index < text.length) {\n        const step = readNext(text, index);\n\n        if (step.reason !== null) {\n            return step.reason;\n        }\n\n        index = step.index;\n    }\n\n    return null;\n};\n\nexport { brokenToken };\n"]}
+{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAEA,MAAM,iBAAiB,GAAG,mCAAmC,CAAC;AAC9D,MAAM,MAAM,GAAG,IAAI,CAAC;AACpB,MAAM,IAAI,GAAG,MAAM,CAAC;AACpB,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AACnC,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAC7C,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAE7B,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,KAAa,EAAU,EAAE,CACvD,KAAK,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;AAEnF,MAAM,OAAO,GAAG,CAAC,IAAY,EAAE,IAAU,EAAQ,EAAE;IAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAErC,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QAClB,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACrF,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;QACtB,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAC3F,CAAC;IAED,OAAO;QACH,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,CAAC;QACrB,KAAK,EAAE,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK;QAC9C,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC;KAC7B,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAW,EAAE;IACjD,IAAI,IAAI,GAAS,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAE1D,OAAO,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC9B,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAE3B,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,CAAC","sourcesContent":["type Scan = { index: number; quote: string | null; broken: boolean };\n\nconst NEWLINE_IN_STRING = \"carries a newline inside a string\";\nconst ESCAPE = \"\\\\\";\nconst CRLF = \"\\r\\n\";\nconst QUOTES = new Set(['\"', \"'\"]);\nconst NEWLINES = new Set([\"\\n\", \"\\r\", \"\\f\"]);\nconst AFTER_ESCAPE = 2;\nconst AFTER_ESCAPED_CRLF = 3;\n\nconst skipEscape = (rule: string, index: number): number =>\n    index + (rule.startsWith(CRLF, index + 1) ? AFTER_ESCAPED_CRLF : AFTER_ESCAPE);\n\nconst stepped = (rule: string, scan: Scan): Scan => {\n    const char = rule.charAt(scan.index);\n\n    if (char === ESCAPE) {\n        return { index: skipEscape(rule, scan.index), quote: scan.quote, broken: false };\n    }\n\n    if (scan.quote === null) {\n        return { index: scan.index + 1, quote: QUOTES.has(char) ? char : null, broken: false };\n    }\n\n    return {\n        index: scan.index + 1,\n        quote: char === scan.quote ? null : scan.quote,\n        broken: NEWLINES.has(char),\n    };\n};\n\nconst hasNewlineInString = (rule: string): boolean => {\n    let scan: Scan = { index: 0, quote: null, broken: false };\n\n    while (scan.index < rule.length) {\n        scan = stepped(rule, scan);\n\n        if (scan.broken) {\n            return true;\n        }\n    }\n\n    return false;\n};\n\nexport { hasNewlineInString, NEWLINE_IN_STRING };\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/css",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "CSS-in-JS for GTK that compiles to real GTK4 CSS.",
   "keywords": [
     "gtkx",
@@ -58,11 +58,11 @@
   "dependencies": {
     "@emotion/serialize": "^1.3.3",
     "stylis": "^4.4.0",
-    "@gtkx/utils": "1.4.0"
+    "@gtkx/utils": "1.5.0"
   },
   "devDependencies": {
     "@types/stylis": "^4.2.7",
-    "@gtkx/vitest": "1.4.0"
+    "@gtkx/vitest": "1.5.0"
   },
   "scripts": {
     "release": "tsx ../../scripts/release-package.ts"

package/src/self-contained.ts

@@ -1,6 +1,5 @@
 import { CssProvider } from "@gtkx/gi/gtk";
 import { randomBytes } from "node:crypto";
-import { brokenToken } from "./tokens.js";
 
 type Gate = { provider: CssProvider | null; ruleset: string | null };
 
@@ -43,14 +42,7 @@ const hasProbe = (serialized: string): boolean => {
     return ruleset.length > 0 && `\n${serialized}`.includes(`\n${ruleset}`);
 };
 
-const containmentFailure = (rule: string): string | null => {
-    const broken = brokenToken(rule);
-
-    if (broken !== null) {
-        return broken;
-    }
-
-    return hasProbe(parsed(`${rule}\n${PROBE_RULE}`)) ? null : SWALLOWS_WHAT_FOLLOWS;
-};
+const containmentFailure = (rule: string): string | null =>
+    hasProbe(parsed(`${rule}\n${PROBE_RULE}`)) ? null : SWALLOWS_WHAT_FOLLOWS;
 
 export { containmentFailure };

package/src/stylesheet.ts

@@ -3,10 +3,17 @@ import { createLogger } from "@gtkx/utils";
 import { attachParsingErrorLogger, registerProviderForDefaultDisplay } from "./provider.js";
 import { hasNul, NUL_REASON, printableRule } from "./rule-text.js";
 import { containmentFailure } from "./self-contained.js";
+import { hasNewlineInString, NEWLINE_IN_STRING } from "./tokens.js";
 
 const log = createLogger("css");
 
-const unusableReason = (rule: string): string | null => (hasNul(rule) ? NUL_REASON : containmentFailure(rule));
+const unusableReason = (rule: string): string | null => {
+    if (hasNul(rule)) {
+        return NUL_REASON;
+    }
+
+    return hasNewlineInString(rule) ? NEWLINE_IN_STRING : containmentFailure(rule);
+};
 
 class StyleSheet {
     private css = "";

package/src/tokens.ts

@@ -1,108 +1,46 @@
-type Step = { index: number; reason: string | null };
+type Scan = { index: number; quote: string | null; broken: boolean };
 
-const UNTERMINATED = "leaves a string, comment or url unterminated";
 const NEWLINE_IN_STRING = "carries a newline inside a string";
 const ESCAPE = "\\";
-const NEWLINE = "\n";
-const CLOSE_PAREN = ")";
-const COMMENT_OPEN = "/*";
-const COMMENT_CLOSE = "*/";
-const URL_OPEN = "url(";
+const CRLF = "\r\n";
 const QUOTES = new Set(['"', "'"]);
-const URL_TOKEN = /url\(/iy;
-const QUOTED_URL = /url\([\t\n\f\r ]*["']/iy;
+const NEWLINES = new Set(["\n", "\r", "\f"]);
+const AFTER_ESCAPE = 2;
+const AFTER_ESCAPED_CRLF = 3;
 
-const hasMatchAt = (pattern: RegExp, text: string, index: number): boolean => {
-    pattern.lastIndex = index;
+const skipEscape = (rule: string, index: number): number =>
+    index + (rule.startsWith(CRLF, index + 1) ? AFTER_ESCAPED_CRLF : AFTER_ESCAPE);
 
-    return pattern.test(text);
-};
-
-const isUrlStart = (text: string, index: number): boolean =>
-    hasMatchAt(URL_TOKEN, text, index) && !hasMatchAt(QUOTED_URL, text, index);
-
-const took = (index: number): Step => ({ index, reason: null });
-const broke = (index: number, reason: string): Step => ({ index, reason });
-const stepped = (text: string, index: number): number => index + (text.charAt(index) === ESCAPE ? 2 : 1);
-
-const endOfString = (text: string, index: number, quote: string): Step | null => {
-    const char = text.charAt(index);
-
-    if (char === quote) {
-        return took(index + 1);
-    }
-
-    return char === NEWLINE ? broke(index + 1, NEWLINE_IN_STRING) : null;
-};
-
-const readString = (text: string, start: number, quote: string): Step => {
-    let index = start;
-
-    while (index < text.length) {
-        const end = endOfString(text, index, quote);
-
-        if (end !== null) {
-            return end;
-        }
-
-        index = stepped(text, index);
-    }
-
-    return broke(index, UNTERMINATED);
-};
-
-const readComment = (text: string, start: number): Step => {
-    const end = text.indexOf(COMMENT_CLOSE, start);
-
-    return end === -1 ? broke(text.length, UNTERMINATED) : took(end + COMMENT_CLOSE.length);
-};
-
-const readUrl = (text: string, start: number): Step => {
-    let index = start;
-
-    while (index < text.length) {
-        if (text.charAt(index) === CLOSE_PAREN) {
-            return took(index + 1);
-        }
-
-        index = stepped(text, index);
-    }
-
-    return broke(index, UNTERMINATED);
-};
-
-const readNext = (text: string, index: number): Step => {
-    const char = text.charAt(index);
+const stepped = (rule: string, scan: Scan): Scan => {
+    const char = rule.charAt(scan.index);
 
     if (char === ESCAPE) {
-        return took(index + 2);
+        return { index: skipEscape(rule, scan.index), quote: scan.quote, broken: false };
     }
 
-    if (QUOTES.has(char)) {
-        return readString(text, index + 1, char);
+    if (scan.quote === null) {
+        return { index: scan.index + 1, quote: QUOTES.has(char) ? char : null, broken: false };
     }
 
-    if (text.startsWith(COMMENT_OPEN, index)) {
-        return readComment(text, index + COMMENT_OPEN.length);
-    }
-
-    return isUrlStart(text, index) ? readUrl(text, index + URL_OPEN.length) : took(index + 1);
+    return {
+        index: scan.index + 1,
+        quote: char === scan.quote ? null : scan.quote,
+        broken: NEWLINES.has(char),
+    };
 };
 
-const brokenToken = (text: string): string | null => {
-    let index = 0;
+const hasNewlineInString = (rule: string): boolean => {
+    let scan: Scan = { index: 0, quote: null, broken: false };
 
-    while (index < text.length) {
-        const step = readNext(text, index);
+    while (scan.index < rule.length) {
+        scan = stepped(rule, scan);
 
-        if (step.reason !== null) {
-            return step.reason;
+        if (scan.broken) {
+            return true;
         }
-
-        index = step.index;
     }
 
-    return null;
+    return false;
 };
 
-export { brokenToken };
+export { hasNewlineInString, NEWLINE_IN_STRING };