intelligent-system-design-language 0.3.26 → 0.3.28

package/out/package.json

@@ -3,7 +3,7 @@
   "displayName": "ISDL - Intelligent System Design Language",
   "description": "Intelligent System Design Language support for Visual Studio Code",
   "publisher": "IronMooseDevelopment",
-  "version": "0.3.26",
+  "version": "0.3.28",
   "author": "Iron Moose Development",
   "repository": {
     "type": "git",

package/out/styles.scss

@@ -35,9 +35,26 @@
 // Copy of Foundry app styles for vue apps
 .#{$dynamic-id}.vue-application {
 
-  --color-text-primary: var(--color-light-2);
+  // Theme token defaults. These color tokens have a single, consistent fallback across all
+  // consumers, so we declare them here (= their default value) instead of leaving them
+  // undeclared. That keeps them always-defined for sidecar / custom.css authors and devtools,
+  // while the generated theme.css (loaded AFTER this file) overrides them when the author sets
+  // the token. Tokens NOT declared here (border/background/heading-color/sizes) intentionally
+  // stay undeclared: their consumers use DIFFERENT fallbacks (e.g. border = transparent on the
+  // field wrapper but --color-cool-4 for input borders), or an `inherit`/`auto`/`none` fallback
+  // that only resolves correctly at the consuming element — a single root default would break them.
+  --isdl-primary: transparent;
+  --isdl-text: var(--color-light-2);
+  // Disabled (play-mode) field text. Form fields keep a light fill regardless of theme, so
+  // the default is a dark on-field color — NOT the sheet body text (light on dark themes).
+  --isdl-disabled-color: var(--color-text-dark-primary);
+
+  // Theme tokens feed the existing cascade variables (fallback = default look, so
+  // unthemed systems are unchanged). Setting `text`/`border { }`/`font { }`/`background` in
+  // `config { theme { } }` propagates through every component that reads these.
+  --color-text-primary: var(--isdl-text, var(--color-light-2));
   --color-header-background: rgba(0, 0, 0, 0.5);
-  --color-border: var(--color-cool-4);
+  --color-border: var(--isdl-border, var(--color-cool-4));
   --color-fieldset-border: var(--color-light-6);
   --color-form-hint: var(--color-light-5);
   --color-form-hint-hover: var(--color-light-4);
@@ -46,15 +63,16 @@
   --color-select-option-bg: transparent;
   --v-theme-overlay-multiplier: 1;
   --v-disabled-opacity: 0.7;
+  font-family: var(--isdl-font, inherit);
 
 
   .window-content {
     @include vuetifyStyles.vuetifyStyles;
     @include vuetifyOverrides.vuetifyOverrides;
 
-    --color-text-primary: var(--color-light-2);
+    --color-text-primary: var(--isdl-text, var(--color-light-2));
     --color-header-background: rgba(0, 0, 0, 0.5);
-    --color-border: var(--color-cool-4);
+    --color-border: var(--isdl-border, var(--color-cool-4));
     --color-fieldset-border: var(--color-light-6);
     --color-form-hint: var(--color-light-5);
     --color-form-hint-hover: var(--color-light-4);
@@ -63,6 +81,17 @@
     --color-select-option-bg: transparent;
     --v-theme-overlay-multiplier: 1;
     --v-disabled-opacity: 0.7;
+    font-family: var(--isdl-font, inherit);
+    font-size: var(--isdl-font-size, inherit);
+    background-color: var(--isdl-background, transparent);
+
+    // Vuetify's <v-app> paints its own theme background (white in the light theme) ON TOP
+    // of .window-content, which would bury the `background` token. When the token is set,
+    // paint the v-app with it; when unset, fall back to Vuetify's own theme background so
+    // an unthemed sheet is unchanged.
+    .v-application {
+      background: var(--isdl-background, rgb(var(--v-theme-background)));
+    }
 
     overflow-y: scroll;
 

package/out/test/validating/theme.test.js

@@ -0,0 +1,120 @@
+import { EmptyFileSystem } from 'langium';
+import { parseHelper } from 'langium/test';
+import { describe, it, expect } from 'vitest';
+import { createIntelligentSystemDesignLanguageServices } from '../../language/intelligent-system-design-language-module.js';
+const services = createIntelligentSystemDesignLanguageServices(EmptyFileSystem);
+const parse = parseHelper(services.IntelligentSystemDesignLanguage);
+async function errors(src) {
+    var _a;
+    const doc = await parse(src, { validation: true });
+    return ((_a = doc.diagnostics) !== null && _a !== void 0 ? _a : []).filter(d => d.severity === 1);
+}
+// A config whose `theme { }` body is filled in per-test, plus a minimal actor whose
+// `attribute Luck` carries an optional per-field `theme: { }` override.
+const sys = (themeBody, luckParams = '') => `config T {
+    id = "t"
+    theme {
+${themeBody}
+    }
+}
+actor A {
+    attribute Luck(${luckParams})
+}`;
+describe('theme token scope validation', () => {
+    it('accepts a valid global theme (palette + config-scope groups)', async () => {
+        const src = sys(`        primary: #112233,
+        secondary: #223344,
+        background: #334455,
+        text: #445566,
+        border { color: #556677, width: 2, radius: 4 },
+        font { family: "Roboto", size: 14 },
+        heading { color: #667788, transform: "uppercase" },
+        disabledText { color: #778899 }`);
+        expect(await errors(src)).toHaveLength(0);
+    });
+    it('rejects width in the global theme (field-only)', async () => {
+        const errs = await errors(sys(`        primary: #112233,
+        width { min: 50px }`));
+        expect(errs.some(e => e.message.includes("'width'"))).toBe(true);
+    });
+    it('rejects height in the global theme (field-only)', async () => {
+        const errs = await errors(sys(`        height { max: 100px }`));
+        expect(errs.some(e => e.message.includes("'height'"))).toBe(true);
+    });
+    it('accepts field-capable tokens per-field (primary/border/width/height)', async () => {
+        const src = sys(`        primary: #112233`, `theme: { primary: #8b1e1e, border: { color: #8b1e1e, width: 3px }, width: { min: 120px, max: 240px }, height: { min: 40px } }`);
+        expect(await errors(src)).toHaveLength(0);
+    });
+    it('rejects each config-only token used per-field', async () => {
+        const badTokens = [
+            ['secondary', 'secondary: #223344'],
+            ['tertiary', 'tertiary: #223344'],
+            ['background', 'background: #223344'],
+            ['text', 'text: #223344'],
+            ['font', 'font: { family: "Roboto" }'],
+            ['heading', 'heading: { color: #223344 }'],
+            ['disabledText', 'disabledText: { color: #223344 }'],
+        ];
+        for (const [label, frag] of badTokens) {
+            const errs = await errors(sys(`        primary: #112233`, `theme: { ${frag} }`));
+            expect(errs.some(e => e.message.includes(`'${label}'`)), `${label} should be rejected per-field`).toBe(true);
+        }
+    });
+    it('parses the JSON-ish per-field style (colon groups, commas, px) with no errors', async () => {
+        // The user's literal example shape: `theme: { primary: #x, width: { min: 50px, max: 100px } }`.
+        const src = sys(`        primary: #112233`, `theme: { primary: #8b1e1e, width: { min: 50px, max: 100px } }`);
+        expect(await errors(src)).toHaveLength(0);
+    });
+    it('requires commas between entries (terse no-comma style is rejected)', async () => {
+        // Theme entries are comma-separated like every other param list. Two top-level tokens
+        // with no comma between them must NOT parse.
+        const missingTopLevel = await errors(sys(`        primary: #112233
+        secondary: #223344`));
+        expect(missingTopLevel.length).toBeGreaterThan(0);
+        // Same inside a group: `color: #x width: 2` (no comma) is a parse error.
+        const missingInGroup = await errors(sys(`        border { color: #556677 width: 2 }`));
+        expect(missingInGroup.length).toBeGreaterThan(0);
+        // The comma-separated form parses clean (optional colon before the group brace still allowed).
+        const ok = await errors(sys(`        primary: #112233,
+        border: { color: #556677, width: 2, radius: 4 }`));
+        expect(ok).toHaveLength(0);
+    });
+});
+// A minimal actor with a single page whose layout container carries the per-test `theme:`.
+const layoutSys = (container) => `config T { id = "t" }
+actor A {
+    page Main {
+        ${container} {
+            attribute Luck
+        }
+    }
+}`;
+describe('layout-container theme scope validation', () => {
+    it('accepts sizing + border on a row', async () => {
+        expect(await errors(layoutSys(`row(theme: { width: { max: 800px }, height: { min: 120px }, border: { color: #223344, width: 2px } })`))).toHaveLength(0);
+    });
+    it('accepts sizing + border on a column', async () => {
+        expect(await errors(layoutSys(`column(theme: { width: { min: 80px, max: 160px }, border: { color: #223344, radius: 8px } })`))).toHaveLength(0);
+    });
+    it('rejects background on a row (fill is section-only)', async () => {
+        const errs = await errors(layoutSys(`row(theme: { background: #223344 })`));
+        expect(errs.some(e => e.message.includes("'background'") && e.message.includes('row'))).toBe(true);
+    });
+    it('rejects text on a column (fill is section-only)', async () => {
+        const errs = await errors(layoutSys(`column(theme: { text: #223344 })`));
+        expect(errs.some(e => e.message.includes("'text'") && e.message.includes('column'))).toBe(true);
+    });
+    it('accepts sizing + box chrome on a section', async () => {
+        const src = layoutSys(`section S(theme: { width: { max: 640px }, border: { color: #223344, width: 2px, radius: 12px }, background: #1a1410, text: #f0e6d2 })`);
+        expect(await errors(src)).toHaveLength(0);
+    });
+    it('rejects a whole-sheet token (font) on a section', async () => {
+        const errs = await errors(layoutSys(`section S(theme: { font: { family: "Roboto" } })`));
+        expect(errs.some(e => e.message.includes("'font'") && e.message.includes('section'))).toBe(true);
+    });
+    it('rejects heading on a section', async () => {
+        const errs = await errors(layoutSys(`section S(theme: { heading: { color: #223344 } })`));
+        expect(errs.some(e => e.message.includes("'heading'") && e.message.includes('section'))).toBe(true);
+    });
+});
+//# sourceMappingURL=theme.test.js.map

package/out/test/validating/theme.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"theme.test.js","sourceRoot":"","sources":["../../../src/test/validating/theme.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "ISDL - Intelligent System Design Language",
   "description": "Intelligent System Design Language support for Visual Studio Code",
   "publisher": "IronMooseDevelopment",
-  "version": "0.3.26",
+  "version": "0.3.28",
   "author": "Iron Moose Development",
   "repository": {
     "type": "git",