@aliens-syndicate/cli 0.1.7 → 0.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,20 +1,20 @@
1
- // Generates the Style page (project/app/pages/style-docs) from the utility catalog of the utilities package that .config
1
+ // Generates the Utilities page (project/app/pages/utilities-docs) from the utility catalog of the utilities package that .config
2
2
  // declares under utilities: from: (usually @aliens-syndicate/utilities), so every class the page lists is a class the build
3
- // accepts. Run it after updating the package: node tools/style-docs.mjs
3
+ // accepts. Run it after updating the package: node tools/utilities-docs.mjs
4
4
  import { readFile, readdir, writeFile, mkdir } from 'node:fs/promises';
5
5
  import { createRequire } from 'node:module';
6
6
  import { join, resolve } from 'node:path';
7
7
  import { pathToFileURL } from 'node:url';
8
+ import { configExtensions, readConfig } from './cli-shared.mjs';
8
9
 
9
10
  const workspace = resolve(import.meta.dirname, '..');
10
- const config = await readFile(join(workspace, '.config'), 'utf8');
11
- const from = /^utilities:\r?\n(?: {3}.*\r?\n)*? {3}from: (.+)$/m.exec(config)?.[1].trim();
12
- if (!from) throw new Error('style-docs: declare the utilities package in .config under utilities: from:.');
11
+ const { from, version } = configExtensions(readConfig(workspace)).find(extension => extension.name === 'utilities') ?? {};
12
+ if (!from || !version) throw new Error('utilities-docs: declare the utilities package in .config under devDependencies: utilities:, like @aliens-syndicate/utilities: 0.1.0.');
13
13
  const entry = /^\.{1,2}\//.test(from) ? join(workspace, from, 'index.mjs') : createRequire(join(workspace, 'package.json')).resolve(from);
14
14
  const {
15
15
  breakpoints, describeVariant, groups, paletteNames, registeredDefaults, resolveUtility, shadeSteps, variantCatalog
16
16
  } = await import(pathToFileURL(entry).href);
17
- const page = join(workspace, 'project/app/pages/style-docs');
17
+ const page = join(workspace, 'project/app/pages/utilities-docs');
18
18
  const styles = join(workspace, 'project/styles');
19
19
 
20
20
  async function styleFiles(directory) {
@@ -49,12 +49,12 @@ function pretty(declarations) {
49
49
  }
50
50
  function row(name) {
51
51
  const utility = resolveUtility(name, { colors: themeColors });
52
- if (utility.error) throw new Error(`style-docs: ${name}: ${utility.error}`);
52
+ if (utility.error) throw new Error(`utilities-docs: ${name}: ${utility.error}`);
53
53
  const css = pretty(utility.declarations);
54
54
  return { name, css: utility.child ? `${utility.child.trim()} { ${css} }` : css };
55
55
  }
56
56
  const camel = id => id.replace(/-([a-z0-9])/g, (_, letter) => letter.toUpperCase());
57
- const titleKey = id => `@styleDocs.group.${camel(id)}`;
57
+ const titleKey = id => `@utilitiesDocs.group.${camel(id)}`;
58
58
  const properties = rows => [...new Set(rows.flatMap(({ css }) => css.replace(/^[^{]*\{ | \}$/g, '').split('; ')
59
59
  .map(entry => entry.slice(0, entry.indexOf(':'))).filter(property => property && !property.startsWith('-webkit-'))))].slice(0, 2);
60
60
 
@@ -74,7 +74,7 @@ const sections = groups.map(group => ({
74
74
  }));
75
75
 
76
76
  list('benefits', ['Names', 'Typing', 'Prefix', 'Responsive', 'States', 'Arbitrary', 'Checked', 'Css'].map(name => ({
77
- title: `@styleDocs.benefit${name}Title`, text: `@styleDocs.benefit${name}`
77
+ title: `@utilitiesDocs.benefit${name}Title`, text: `@utilitiesDocs.benefit${name}`
78
78
  })));
79
79
  const variantRows = names => names.map(name => {
80
80
  const described = describeVariant(name);
@@ -93,9 +93,9 @@ list('palette', paletteNames.flatMap(family => shadeSteps.map(shade => ({
93
93
  const indent = level => ' '.repeat(level);
94
94
  const lines = [];
95
95
  const add = (level, text) => lines.push(indent(level) + text);
96
- function table(level, listName, first = '@styleDocs.classColumn', second = '@styleDocs.stylesColumn') {
97
- add(level, 'div variant="style-docs-table-frame" tabindex="0"');
98
- add(level + 1, 'table variant="style-docs-table"');
96
+ function table(level, listName, first = '@utilitiesDocs.classColumn', second = '@utilitiesDocs.stylesColumn') {
97
+ add(level, 'div variant="utilities-docs-table-frame" tabindex="0"');
98
+ add(level + 1, 'table variant="utilities-docs-table"');
99
99
  add(level + 2, 'thead');
100
100
  add(level + 3, 'tr');
101
101
  add(level + 4, `th={${first}} scope="col"`);
@@ -104,7 +104,7 @@ function table(level, listName, first = '@styleDocs.classColumn', second = '@sty
104
104
  add(level + 3, `for row in ${listName}`);
105
105
  add(level + 4, 'tr data-filter-item');
106
106
  add(level + 5, 'td');
107
- add(level + 6, 'code={$row.name} variant="style-docs-class"');
107
+ add(level + 6, 'code={$row.name} variant="utilities-docs-class"');
108
108
  add(level + 5, 'td');
109
109
  add(level + 6, 'code={$row.css}');
110
110
  }
@@ -117,54 +117,54 @@ function window(level, title, source) {
117
117
  add(level + 2, `code data-source="${source}"`);
118
118
  }
119
119
 
120
- lines.push('Markup StyleDocs');
121
- add(1, 'article variant="home-view" id="style-docs" data-view data-search-entry hidden tabindex="-1"');
122
- add(2, 'aside id="style-docs-sidebar"');
120
+ lines.push('Markup UtilitiesDocs');
121
+ add(1, 'article variant="home-view" id="utilities-docs" data-view data-search-entry hidden tabindex="-1"');
122
+ add(2, 'aside id="utilities-docs-sidebar"');
123
123
  // The search field sits on top of the sidebar, which stays in view while the page scrolls, and filters the sections.
124
- add(3, 'div id="style-docs-finder"');
125
- add(4, 'form id="style-docs-finder-form" role="search"');
126
- add(5, 'label={@styleDocs.searchLabel} for="style-docs-finder-input" id="style-docs-finder-label"');
127
- add(5, 'icon search-01 id="style-docs-finder-icon"');
128
- add(5, 'input type="search" id="style-docs-finder-input" placeholder={@styleDocs.searchPlaceholder} autocomplete="off" spellcheck="false" data-filter');
129
- add(4, 'p id="style-docs-finder-status" data-filter-status aria-live="polite" hidden');
130
- add(5, 'span text="0" id="style-docs-finder-count" data-filter-count');
131
- add(5, 'span={@styleDocs.searchResults}');
132
- add(3, 'nav id="style-docs-nav" aria-label={@styleDocs.navLabel} data-toc');
133
- add(4, 'p={@styleDocs.groupStart} variant="style-docs-nav-title"');
124
+ add(3, 'div id="utilities-docs-finder"');
125
+ add(4, 'form id="utilities-docs-finder-form" role="search"');
126
+ add(5, 'label={@utilitiesDocs.searchLabel} for="utilities-docs-finder-input" id="utilities-docs-finder-label"');
127
+ add(5, 'icon search-01 id="utilities-docs-finder-icon"');
128
+ add(5, 'input type="search" id="utilities-docs-finder-input" placeholder={@utilitiesDocs.searchPlaceholder} autocomplete="off" spellcheck="false" data-filter');
129
+ add(4, 'p id="utilities-docs-finder-status" data-filter-status aria-live="polite" hidden');
130
+ add(5, 'span text="0" id="utilities-docs-finder-count" data-filter-count');
131
+ add(5, 'span={@utilitiesDocs.searchResults}');
132
+ add(3, 'nav id="utilities-docs-nav" aria-label={@utilitiesDocs.navLabel} data-toc');
133
+ add(4, 'p={@utilitiesDocs.groupStart} variant="utilities-docs-nav-title"');
134
134
  for (const [anchor, key] of [['overview', 'overviewNav'], ['install', 'installNav'], ['benefits', 'benefitsNav'], ['writing', 'writingNav'],
135
135
  ['responsive', 'responsiveNav'], ['states', 'statesNav'], ['arbitrary', 'arbitraryNav'], ['colors', 'colorsNav']]) {
136
- add(4, `a={@styleDocs.${key}} href="#style-docs-${anchor}" variant="style-docs-nav-link"`);
136
+ add(4, `a={@utilitiesDocs.${key}} href="#utilities-docs-${anchor}" variant="utilities-docs-nav-link"`);
137
137
  }
138
- add(4, 'a={@styleDocs.libraryNav} href="#kit-overview" variant="style-docs-nav-link"');
138
+ add(4, 'a={@utilitiesDocs.libraryNav} href="#kit-overview" variant="utilities-docs-nav-link"');
139
139
  for (const group of sections) {
140
- add(4, `p={${titleKey(group.id)}} variant="style-docs-nav-title"`);
141
- for (const section of group.sections) add(4, `a={${section.title}} href="#style-docs-${section.id}" variant="style-docs-nav-link"`);
140
+ add(4, `p={${titleKey(group.id)}} variant="utilities-docs-nav-title"`);
141
+ for (const section of group.sections) add(4, `a={${section.title}} href="#utilities-docs-${section.id}" variant="utilities-docs-nav-link"`);
142
142
  }
143
- add(2, 'div id="style-docs-main"');
144
- add(3, 'header id="style-docs-overview"');
143
+ add(2, 'div id="utilities-docs-main"');
144
+ add(3, 'header id="utilities-docs-overview"');
145
145
  add(4, 'p variant="home-breadcrumb"');
146
146
  add(5, 'a={@nav.home} href="#home-guide"');
147
147
  add(5, 'span={/} aria-hidden="true"');
148
- add(5, 'span={@nav.styles}');
149
- add(4, 'p={@styleDocs.eyebrow} id="style-docs-eyebrow"');
150
- add(4, 'h1={@styleDocs.title} data-search-label');
151
- add(4, 'p={@styleDocs.lead} variant="home-topic-lead" data-search-summary');
152
- add(4, 'div id="style-docs-hero-code" aria-hidden="true"');
153
- add(5, 'code={flex items-center gap-4 md:flex-row hover:bg-surface dark:text-white} id="style-docs-hero-line"');
148
+ add(5, 'span={@nav.utilities}');
149
+ add(4, 'p={@utilitiesDocs.eyebrow} id="utilities-docs-eyebrow"');
150
+ add(4, 'h1={@utilitiesDocs.title} data-search-label');
151
+ add(4, 'p={@utilitiesDocs.lead} variant="home-topic-lead" data-search-summary');
152
+ add(4, 'div id="utilities-docs-hero-code" aria-hidden="true"');
153
+ add(5, 'code={flex items-center gap-4 md:flex-row hover:bg-surface dark:text-white} id="utilities-docs-hero-line"');
154
154
 
155
- add(3, 'p={@styleDocs.searchEmpty} id="style-docs-finder-empty" data-filter-empty hidden');
155
+ add(3, 'p={@utilitiesDocs.searchEmpty} id="utilities-docs-finder-empty" data-filter-empty hidden');
156
156
  // Installation: plain CSS works without the package; utilities need it installed and declared in .config.
157
- add(3, 'section variant="style-docs-block" data-filter-group id="style-docs-install"');
158
- add(4, 'h2={@styleDocs.installTitle}');
159
- add(4, 'p={@styleDocs.installDetail} variant="style-docs-lead"');
160
- add(4, 'ol variant="style-docs-steps"');
157
+ add(3, 'section variant="utilities-docs-block" data-filter-group id="utilities-docs-install"');
158
+ add(4, 'h2={@utilitiesDocs.installTitle}');
159
+ add(4, 'p={@utilitiesDocs.installDetail} variant="utilities-docs-lead"');
160
+ add(4, 'ol variant="utilities-docs-steps"');
161
161
  for (const [key, title, code] of [
162
162
  ['installStep', 'terminal', ['npm install @aliens-syndicate/utilities']],
163
- ['configStep', '.config', ['utilities:', ' from: @aliens-syndicate/utilities']],
163
+ ['configStep', '.config', ['devDependencies:', ' utilities:', ` ${from}: ${version}`]],
164
164
  ['useStep', 'counter.style', ['Style Counter', ' counter', ' flex items-center gap-3 md:gap-4', ' transition: color .15s',
165
165
  ' counter-button', ' px-4 py-2 rounded-lg hover:bg-(--surface)']]]) {
166
166
  add(5, 'li');
167
- add(6, `p={@styleDocs.${key}}`);
167
+ add(6, `p={@utilitiesDocs.${key}}`);
168
168
  add(6, 'div variant="home-guide-window"');
169
169
  add(7, 'div variant="home-guide-window-bar"');
170
170
  add(8, 'span variant="home-guide-window-dots" aria-hidden="true"');
@@ -172,21 +172,21 @@ for (const [key, title, code] of [
172
172
  add(7, 'div variant="home-guide-window-code home-guide-code" tabindex="0"');
173
173
  for (const text of code) add(8, `code text="${text}" variant="home-guide-code-line"`);
174
174
  }
175
- add(3, 'section variant="style-docs-block" data-filter-group id="style-docs-benefits"');
176
- add(4, 'h2={@styleDocs.benefitsTitle}');
177
- add(4, 'p={@styleDocs.benefitsDetail} variant="style-docs-lead"');
178
- add(4, 'ul id="style-docs-benefit-list"');
175
+ add(3, 'section variant="utilities-docs-block" data-filter-group id="utilities-docs-benefits"');
176
+ add(4, 'h2={@utilitiesDocs.benefitsTitle}');
177
+ add(4, 'p={@utilitiesDocs.benefitsDetail} variant="utilities-docs-lead"');
178
+ add(4, 'ul id="utilities-docs-benefit-list"');
179
179
  add(5, 'for benefit in benefits');
180
180
  add(6, 'li data-filter-item');
181
181
  add(7, 'strong={$benefit.title}');
182
182
  add(7, 'span={$benefit.text}');
183
- add(4, 'h3={@styleDocs.compareTitle}');
184
- add(4, 'p={@styleDocs.compareDetail} variant="style-docs-lead"');
185
- add(4, 'div id="style-docs-compare"');
183
+ add(4, 'h3={@utilitiesDocs.compareTitle}');
184
+ add(4, 'p={@utilitiesDocs.compareDetail} variant="utilities-docs-lead"');
185
+ add(4, 'div id="utilities-docs-compare"');
186
186
  add(5, 'div variant="home-guide-window"');
187
187
  add(6, 'div variant="home-guide-window-bar"');
188
188
  add(7, 'span variant="home-guide-window-dots" aria-hidden="true"');
189
- add(7, 'code={@styleDocs.compareBefore}');
189
+ add(7, 'code={@utilitiesDocs.compareBefore}');
190
190
  add(6, 'div variant="home-guide-window-code home-guide-code" tabindex="0"');
191
191
  for (const text of ['Style SiteHeader', ' site-header', ' position: sticky', ' top: 0', ' z-index: 5',
192
192
  ' border-bottom: 1px solid var(--line)', ' background: color-mix(in srgb, var(--page) 82%, transparent)',
@@ -197,78 +197,78 @@ for (const text of ['Style SiteHeader', ' site-header', ' position: stick
197
197
  add(5, 'div variant="home-guide-window"');
198
198
  add(6, 'div variant="home-guide-window-bar"');
199
199
  add(7, 'span variant="home-guide-window-dots" aria-hidden="true"');
200
- add(7, 'code={@styleDocs.compareAfter}');
200
+ add(7, 'code={@utilitiesDocs.compareAfter}');
201
201
  add(6, 'div variant="home-guide-window-code home-guide-code" tabindex="0"');
202
202
  for (const text of ['Style SiteHeader', ' site-header', ' sticky top-0 z-5 border-b border-b-(--line) bg-(--page)/82',
203
203
  ' backdrop-saturate-180 backdrop-blur-md', ' site-header-inner', ' max-lg:min-h-14.5 max-lg:py-0 max-lg:px-3.5']) {
204
204
  add(7, `code text="${text}" variant="home-guide-code-line"`);
205
205
  }
206
206
 
207
- add(3, 'section variant="style-docs-block" data-filter-group id="style-docs-writing"');
208
- add(4, 'h2={@styleDocs.writingTitle}');
209
- add(4, 'p={@styleDocs.writingDetail} variant="style-docs-lead"');
207
+ add(3, 'section variant="utilities-docs-block" data-filter-group id="utilities-docs-writing"');
208
+ add(4, 'h2={@utilitiesDocs.writingTitle}');
209
+ add(4, 'p={@utilitiesDocs.writingDetail} variant="utilities-docs-lead"');
210
210
  add(4, 'ul variant="home-guide-checks"');
211
211
  for (const key of ['writingDeclaration', 'writingUtilities', 'writingVariants', 'writingImportant']) {
212
212
  add(5, 'li');
213
213
  add(6, 'icon tick-02 variant="home-guide-check"');
214
- add(6, `span={@styleDocs.${key}}`);
214
+ add(6, `span={@utilitiesDocs.${key}}`);
215
215
  }
216
216
  window(4, 'site-header.style', 'project/app/elements/organisms/site-header/site-header.style');
217
217
 
218
- add(3, 'section variant="style-docs-block" data-filter-group id="style-docs-responsive"');
219
- add(4, 'h2={@styleDocs.responsiveTitle}');
220
- add(4, 'p={@styleDocs.responsiveDetail} variant="style-docs-lead"');
221
- table(4, 'responsiveVariants', '@styleDocs.variantColumn', '@styleDocs.conditionColumn');
222
- add(3, 'section variant="style-docs-block" data-filter-group id="style-docs-states"');
223
- add(4, 'h2={@styleDocs.statesTitle}');
224
- add(4, 'p={@styleDocs.statesDetail} variant="style-docs-lead"');
225
- table(4, 'stateVariants', '@styleDocs.variantColumn', '@styleDocs.conditionColumn');
226
- add(3, 'section variant="style-docs-block" data-filter-group id="style-docs-arbitrary"');
227
- add(4, 'h2={@styleDocs.arbitraryTitle}');
228
- add(4, 'p={@styleDocs.arbitraryDetail} variant="style-docs-lead"');
218
+ add(3, 'section variant="utilities-docs-block" data-filter-group id="utilities-docs-responsive"');
219
+ add(4, 'h2={@utilitiesDocs.responsiveTitle}');
220
+ add(4, 'p={@utilitiesDocs.responsiveDetail} variant="utilities-docs-lead"');
221
+ table(4, 'responsiveVariants', '@utilitiesDocs.variantColumn', '@utilitiesDocs.conditionColumn');
222
+ add(3, 'section variant="utilities-docs-block" data-filter-group id="utilities-docs-states"');
223
+ add(4, 'h2={@utilitiesDocs.statesTitle}');
224
+ add(4, 'p={@utilitiesDocs.statesDetail} variant="utilities-docs-lead"');
225
+ table(4, 'stateVariants', '@utilitiesDocs.variantColumn', '@utilitiesDocs.conditionColumn');
226
+ add(3, 'section variant="utilities-docs-block" data-filter-group id="utilities-docs-arbitrary"');
227
+ add(4, 'h2={@utilitiesDocs.arbitraryTitle}');
228
+ add(4, 'p={@utilitiesDocs.arbitraryDetail} variant="utilities-docs-lead"');
229
229
  table(4, 'arbitraryValues');
230
- add(3, 'section variant="style-docs-block" data-filter-group id="style-docs-colors"');
231
- add(4, 'h2={@styleDocs.colorsTitle}');
232
- add(4, 'p={@styleDocs.colorsDetail} variant="style-docs-lead"');
233
- add(4, 'h3={@styleDocs.themeColorsTitle}');
234
- add(4, 'ul id="style-docs-theme-colors"');
230
+ add(3, 'section variant="utilities-docs-block" data-filter-group id="utilities-docs-colors"');
231
+ add(4, 'h2={@utilitiesDocs.colorsTitle}');
232
+ add(4, 'p={@utilitiesDocs.colorsDetail} variant="utilities-docs-lead"');
233
+ add(4, 'h3={@utilitiesDocs.themeColorsTitle}');
234
+ add(4, 'ul id="utilities-docs-theme-colors"');
235
235
  add(5, 'for color in themeColors');
236
236
  add(6, 'li data-filter-item');
237
- add(7, 'span variant="style-docs-swatch" style={$color.swatch} aria-hidden="true"');
237
+ add(7, 'span variant="utilities-docs-swatch" style={$color.swatch} aria-hidden="true"');
238
238
  add(7, 'code={$color.name}');
239
- add(4, 'h3={@styleDocs.paletteTitle}');
240
- add(4, 'ul id="style-docs-palette"');
239
+ add(4, 'h3={@utilitiesDocs.paletteTitle}');
240
+ add(4, 'ul id="utilities-docs-palette"');
241
241
  add(5, 'for color in palette');
242
242
  add(6, 'li title={$color.name} data-filter-item');
243
- add(7, 'span variant="style-docs-swatch" style={$color.swatch} aria-hidden="true"');
243
+ add(7, 'span variant="utilities-docs-swatch" style={$color.swatch} aria-hidden="true"');
244
244
  add(7, 'code={$color.name}');
245
245
  for (const group of sections) {
246
- add(3, `section variant="style-docs-group" data-filter-set id="style-docs-${group.id}"`);
246
+ add(3, `section variant="utilities-docs-group" data-filter-set id="utilities-docs-${group.id}"`);
247
247
  add(4, `h2={${titleKey(group.id)}}`);
248
248
  for (const section of group.sections) {
249
- add(4, `section variant="style-docs-section" data-filter-group id="style-docs-${section.id}"`);
249
+ add(4, `section variant="utilities-docs-section" data-filter-group id="utilities-docs-${section.id}"`);
250
250
  add(5, `h3={${section.title}}`);
251
- add(5, 'p variant="style-docs-lead"');
252
- add(6, 'span={@styleDocs.setsBefore}');
251
+ add(5, 'p variant="utilities-docs-lead"');
252
+ add(6, 'span={@utilitiesDocs.setsBefore}');
253
253
  section.properties.forEach((property, index) => {
254
- if (index) add(6, 'span={@styleDocs.and}');
254
+ if (index) add(6, 'span={@utilitiesDocs.and}');
255
255
  add(6, `code={${property}}`);
256
256
  });
257
- add(6, 'span={@styleDocs.setsAfter}');
257
+ add(6, 'span={@utilitiesDocs.setsAfter}');
258
258
  table(5, camel(section.id));
259
259
  }
260
260
  }
261
- add(3, 'section variant="style-docs-block" data-filter-group id="style-docs-library"');
262
- add(4, 'h2={@styleDocs.libraryTitle}');
263
- add(4, 'p={@styleDocs.libraryDetail} variant="style-docs-lead"');
264
- add(4, `ui-link href="#kit-overview" variant="ui-link_secondary" label={@styleDocs.libraryLink} icon="arrow-up-right-01"`);
261
+ add(3, 'section variant="utilities-docs-block" data-filter-group id="utilities-docs-library"');
262
+ add(4, 'h2={@utilitiesDocs.libraryTitle}');
263
+ add(4, 'p={@utilitiesDocs.libraryDetail} variant="utilities-docs-lead"');
264
+ add(4, `ui-link href="#kit-overview" variant="ui-link_secondary" label={@utilitiesDocs.libraryLink} icon="arrow-up-right-01"`);
265
265
 
266
266
  await mkdir(page, { recursive: true });
267
- await writeFile(join(page, 'style-docs.markup'), lines.join('\n') + '\n');
268
- await writeFile(join(page, 'style-docs.logic'), `Logic StyleDocs
269
- # Generated by tools/style-docs.mjs from the utility catalog of @aliens-syndicate/utilities. Update the package, not this file.
267
+ await writeFile(join(page, 'utilities-docs.markup'), lines.join('\n') + '\n');
268
+ await writeFile(join(page, 'utilities-docs.logic'), `Logic UtilitiesDocs
269
+ # Generated by tools/utilities-docs.mjs from the utility catalog of @aliens-syndicate/utilities. Update the package, not this file.
270
270
  ${lists.join('\n')}
271
271
  `);
272
272
  const total = sections.reduce((sum, group) => sum + group.sections.reduce((count, section) => count + section.rows.length, 0), 0);
273
- console.log(`Style page generated: ${sections.reduce((sum, group) => sum + group.sections.length, 0)} sections, ${total} classes, ` +
273
+ console.log(`Utilities page generated: ${sections.reduce((sum, group) => sum + group.sections.length, 0)} sections, ${total} classes, ` +
274
274
  `breakpoints ${Object.keys(breakpoints).join(', ')}.`);
@@ -24,7 +24,7 @@
24
24
  },
25
25
  { "name": "constant.other.color.rgb-value.hex.space", "match": "#(?:[A-Fa-f0-9]{8}|[A-Fa-f0-9]{6}|[A-Fa-f0-9]{4}|[A-Fa-f0-9]{3})(?![\\w-])" },
26
26
  { "name": "storage.type.space", "match": "\\b(?:number|integer|string|boolean|void)\\b" },
27
- { "name": "keyword.control.space", "match": "\\b(?:import|signal|computed|effect|actions|returns|body|function|return|if|else)\\b" },
27
+ { "name": "keyword.control.space", "match": "\\b(?:import|signal|computed|effect|watch|cleanup|actions|returns|body|function|return|if|else)\\b" },
28
28
  { "name": "variable.other.space", "match": "\\$[A-Za-z_][\\w.-]*" },
29
29
  { "name": "string.unquoted.translation.space", "match": "@[A-Za-z_][\\w.-]*" },
30
30
  { "name": "constant.numeric.space", "match": "\\b\\d+(?:\\.\\d+)?\\b" }
@@ -2,7 +2,8 @@ const { findColors } = require('./style-colors.cjs');
2
2
 
3
3
  const reserved = new Map([
4
4
  ['signal', 'spaceReactive'], ['computed', 'spaceReactive'],
5
- ['effect', 'spaceReactive'], ['actions', 'spaceActions'],
5
+ ['effect', 'spaceReactive'], ['watch', 'spaceReactive'],
6
+ ['cleanup', 'keyword'], ['actions', 'spaceActions'],
6
7
  ['returns', 'spaceReturn'], ['return', 'spaceReturn'],
7
8
  ['import', 'keyword'], ['body', 'keyword'],
8
9
  ['onInit', 'keyword'], ['onMount', 'keyword'],
@@ -134,7 +135,9 @@ function analyzeSpace(source, extension) {
134
135
 
135
136
  const loop = markup && /^for\s/.test(body);
136
137
  const element = markup && !loop && /^[a-z][\w-]*/.exec(body)?.[0];
137
- const signal = /^signal\s+(\w+):/.exec(body)?.[1];
138
+ const signal = /^(?:signal|computed)\s+(\w+):/.exec(body)?.[1];
139
+ const watched = /^watch\s+(\w+):$/.exec(body)?.[1];
140
+ const effect = /^effect\s+(\w+):$/.exec(body)?.[1];
138
141
  const action = parent === 'actions' && /^(\w+):$/.exec(body)?.[1];
139
142
  const callable = /^function\s+(\w+)\(/.exec(body)?.[1];
140
143
  const field = parent && !markup && /^(\w[\w-]*):/.exec(body)?.[1];
@@ -149,7 +152,8 @@ function analyzeSpace(source, extension) {
149
152
  else if (loop && token === 'in') type = 'keyword';
150
153
  else if (markup && /^\s*=/.test(rest) && /^[a-z][\w-]*$/.test(token)) type = 'property';
151
154
  else if (token === signal) { type = 'variable'; declaration = true; }
152
- else if (token === action || token === callable) { type = 'function'; declaration = true; }
155
+ else if (token === watched && start > indent) type = 'variable';
156
+ else if (token === action || token === callable || (token === effect && start > indent)) { type = 'function'; declaration = true; }
153
157
  else if (!type && !markup && text.slice(0, start).endsWith('this.')) type = 'property';
154
158
  else if (!type && start === indent && token === field) type = 'property';
155
159
  if (type) emit(start, token.length, type, declaration);