@arbor-css/core 0.0.70 → 0.0.72
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.
- package/dist/cli/run.js +120 -12
- package/dist/cli/run.js.map +1 -1
- package/dist/cli/validate.d.ts +28 -0
- package/dist/cli/validate.d.ts.map +1 -0
- package/dist/cli/validate.js +185 -0
- package/dist/cli/validate.js.map +1 -0
- package/dist/cli/validate.test.d.ts +2 -0
- package/dist/cli/validate.test.d.ts.map +1 -0
- package/dist/cli/validate.test.js +91 -0
- package/dist/cli/validate.test.js.map +1 -0
- package/dist/getStructuredTokensMap.test.js +4 -4
- package/dist/getStructuredTokensMap.test.js.map +1 -1
- package/dist/runtime/components/GlobalsEditor.js +3 -3
- package/dist/runtime/components/GlobalsEditor.js.map +1 -1
- package/dist/runtime/components/SchemeSelector.js +1 -1
- package/dist/runtime/components/SchemeSelector.js.map +1 -1
- package/dist/stylesheet/generateStylesheet.d.ts.map +1 -1
- package/dist/stylesheet/generateStylesheet.js +11 -9
- package/dist/stylesheet/generateStylesheet.js.map +1 -1
- package/dist/util/resolveTokenReferences.js +4 -4
- package/dist/util/resolveTokenReferences.js.map +1 -1
- package/dist/util/resolveTokenReferences.test.js +2 -2
- package/dist/util/resolveTokenReferences.test.js.map +1 -1
- package/package.json +13 -13
package/dist/cli/run.js
CHANGED
|
@@ -6,7 +6,50 @@ import path from 'node:path';
|
|
|
6
6
|
import yargs from 'yargs';
|
|
7
7
|
import { hideBin } from 'yargs/helpers';
|
|
8
8
|
import { generateStylesheet } from '../stylesheet/generateStylesheet.js';
|
|
9
|
+
import { createPrefixValidationConfig, createTokenMap, validateCssContent, } from './validate.js';
|
|
9
10
|
const jiti = createJiti(import.meta.url);
|
|
11
|
+
async function loadArborConfig(configPath) {
|
|
12
|
+
const arborModule = await jiti.import(configPath);
|
|
13
|
+
const arbor = arborModule.default ?? arborModule.arbor ?? arborModule;
|
|
14
|
+
if (!arbor || typeof arbor !== 'object' || !('$' in arbor)) {
|
|
15
|
+
throw new Error('Configuration file must export an Arbor preset object as default export.');
|
|
16
|
+
}
|
|
17
|
+
return arbor;
|
|
18
|
+
}
|
|
19
|
+
const CSS_EXTENSIONS = new Set(['.css', '.scss', '.less']);
|
|
20
|
+
const SKIPPED_DIRECTORIES = new Set([
|
|
21
|
+
'.git',
|
|
22
|
+
'node_modules',
|
|
23
|
+
'dist',
|
|
24
|
+
'.next',
|
|
25
|
+
'.astro',
|
|
26
|
+
]);
|
|
27
|
+
async function collectCssFiles(rootDir) {
|
|
28
|
+
const files = [];
|
|
29
|
+
async function walk(currentDir) {
|
|
30
|
+
const entries = await fs.promises.readdir(currentDir, {
|
|
31
|
+
withFileTypes: true,
|
|
32
|
+
});
|
|
33
|
+
for (const entry of entries) {
|
|
34
|
+
const entryPath = path.join(currentDir, entry.name);
|
|
35
|
+
if (entry.isDirectory()) {
|
|
36
|
+
if (SKIPPED_DIRECTORIES.has(entry.name)) {
|
|
37
|
+
continue;
|
|
38
|
+
}
|
|
39
|
+
await walk(entryPath);
|
|
40
|
+
continue;
|
|
41
|
+
}
|
|
42
|
+
if (!entry.isFile()) {
|
|
43
|
+
continue;
|
|
44
|
+
}
|
|
45
|
+
if (CSS_EXTENSIONS.has(path.extname(entry.name).toLowerCase())) {
|
|
46
|
+
files.push(entryPath);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
await walk(rootDir);
|
|
51
|
+
return files;
|
|
52
|
+
}
|
|
10
53
|
yargs(hideBin(process.argv))
|
|
11
54
|
.command('build', 'Build your CSS', (y) => y
|
|
12
55
|
.option('config', {
|
|
@@ -19,21 +62,86 @@ yargs(hideBin(process.argv))
|
|
|
19
62
|
type: 'string',
|
|
20
63
|
description: 'Path to the output file',
|
|
21
64
|
}), async (argv) => {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
65
|
+
try {
|
|
66
|
+
console.log('Building with config:', argv.config);
|
|
67
|
+
console.log('Output file:', argv.output);
|
|
68
|
+
const resolvedConfigPath = path.join(process.cwd(), argv.config || 'arbor.config.ts');
|
|
69
|
+
const arbor = await loadArborConfig(resolvedConfigPath);
|
|
70
|
+
const content = await generateStylesheet(arbor);
|
|
71
|
+
if (argv.output) {
|
|
72
|
+
await fs.promises.writeFile(argv.output, content, 'utf-8');
|
|
73
|
+
console.log(`Stylesheet written to ${argv.output}`);
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
console.log(content);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
catch (error) {
|
|
80
|
+
console.error(error instanceof Error ? error.message : String(error));
|
|
28
81
|
process.exit(1);
|
|
29
82
|
}
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
83
|
+
})
|
|
84
|
+
.command('validate [files...]', 'Validate Arbor-prefixed CSS declarations, function calls, and @apply mixins', (y) => y
|
|
85
|
+
.positional('files', {
|
|
86
|
+
type: 'string',
|
|
87
|
+
array: true,
|
|
88
|
+
default: [],
|
|
89
|
+
description: 'CSS files to validate',
|
|
90
|
+
})
|
|
91
|
+
.option('config', {
|
|
92
|
+
alias: 'c',
|
|
93
|
+
type: 'string',
|
|
94
|
+
description: 'Path to the configuration file',
|
|
95
|
+
}), async (argv) => {
|
|
96
|
+
try {
|
|
97
|
+
const providedFiles = argv.files ?? [];
|
|
98
|
+
const files = providedFiles.length > 0 ?
|
|
99
|
+
providedFiles.map((file) => path.isAbsolute(file) ? file : path.join(process.cwd(), file))
|
|
100
|
+
: await collectCssFiles(process.cwd());
|
|
101
|
+
if (files.length === 0) {
|
|
102
|
+
console.error('No CSS files found to validate.');
|
|
103
|
+
process.exit(1);
|
|
104
|
+
}
|
|
105
|
+
const resolvedConfigPath = path.join(process.cwd(), argv.config || 'arbor.config.ts');
|
|
106
|
+
const arbor = await loadArborConfig(resolvedConfigPath);
|
|
107
|
+
const tokenMap = createTokenMap(arbor);
|
|
108
|
+
const prefixConfig = createPrefixValidationConfig(arbor.context.tokenPrefixes);
|
|
109
|
+
let totalIssues = 0;
|
|
110
|
+
for (const filePath of files) {
|
|
111
|
+
const displayPath = path.relative(process.cwd(), filePath) || filePath;
|
|
112
|
+
let cssContent = '';
|
|
113
|
+
try {
|
|
114
|
+
cssContent = await fs.promises.readFile(filePath, 'utf-8');
|
|
115
|
+
}
|
|
116
|
+
catch (error) {
|
|
117
|
+
console.error(`ERROR ${displayPath}: ${error instanceof Error ? error.message : String(error)}`);
|
|
118
|
+
totalIssues += 1;
|
|
119
|
+
continue;
|
|
120
|
+
}
|
|
121
|
+
const issues = validateCssContent({
|
|
122
|
+
content: cssContent,
|
|
123
|
+
tokenMap,
|
|
124
|
+
prefixConfig,
|
|
125
|
+
});
|
|
126
|
+
if (issues.length === 0) {
|
|
127
|
+
console.log(`OK ${displayPath}`);
|
|
128
|
+
continue;
|
|
129
|
+
}
|
|
130
|
+
console.error(`ERROR ${displayPath}`);
|
|
131
|
+
for (const issue of issues) {
|
|
132
|
+
console.error(` ${issue.line}:${issue.column} ${issue.message}`);
|
|
133
|
+
}
|
|
134
|
+
totalIssues += issues.length;
|
|
135
|
+
}
|
|
136
|
+
if (totalIssues > 0) {
|
|
137
|
+
console.error(`Validation failed with ${totalIssues} issue(s).`);
|
|
138
|
+
process.exit(1);
|
|
139
|
+
}
|
|
140
|
+
console.log(`Validation passed for ${files.length} file(s).`);
|
|
34
141
|
}
|
|
35
|
-
|
|
36
|
-
console.
|
|
142
|
+
catch (error) {
|
|
143
|
+
console.error(error instanceof Error ? error.message : String(error));
|
|
144
|
+
process.exit(1);
|
|
37
145
|
}
|
|
38
146
|
})
|
|
39
147
|
.demandCommand(1, 'You need to specify a command')
|
package/dist/cli/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":";AACA,8BAA8B;AAE9B,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { type ArborFunction, type ArborMixin } from '@arbor-css/functions';
|
|
2
|
+
import { type ArborResolvedPrefixes } from '@arbor-css/globals';
|
|
3
|
+
import type { AnyArborPreset } from '@arbor-css/preset/config';
|
|
4
|
+
import type { Token } from '@arbor-css/tokens';
|
|
5
|
+
type TokenMapValue = Token | ArborFunction | ArborMixin<any, any>;
|
|
6
|
+
export type TokenMap = Map<string, TokenMapValue>;
|
|
7
|
+
export interface PrefixValidationConfig {
|
|
8
|
+
tokenPrefixes: string[];
|
|
9
|
+
functionNamePrefix: string;
|
|
10
|
+
mixinNamePrefix: string;
|
|
11
|
+
}
|
|
12
|
+
export interface ValidationIssue {
|
|
13
|
+
name: string;
|
|
14
|
+
kind: 'token' | 'function' | 'mixin';
|
|
15
|
+
message: string;
|
|
16
|
+
index: number;
|
|
17
|
+
line: number;
|
|
18
|
+
column: number;
|
|
19
|
+
}
|
|
20
|
+
export declare function createTokenMap(preset: AnyArborPreset): TokenMap;
|
|
21
|
+
export declare function createPrefixValidationConfig(tokenPrefixes: ArborResolvedPrefixes): PrefixValidationConfig;
|
|
22
|
+
export declare function validateCssContent({ content, tokenMap, prefixConfig, }: {
|
|
23
|
+
content: string;
|
|
24
|
+
tokenMap: TokenMap;
|
|
25
|
+
prefixConfig: PrefixValidationConfig;
|
|
26
|
+
}): ValidationIssue[];
|
|
27
|
+
export {};
|
|
28
|
+
//# sourceMappingURL=validate.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/cli/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,KAAK,aAAa,EAClB,KAAK,UAAU,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEN,KAAK,qBAAqB,EAC1B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE/C,KAAK,aAAa,GAAG,KAAK,GAAG,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAElE,MAAM,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAElD,MAAM,WAAW,sBAAsB;IACtC,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,eAAe;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,OAAO,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CACf;AAiFD,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,QAAQ,CAgB/D;AAED,wBAAgB,4BAA4B,CAC3C,aAAa,EAAE,qBAAqB,GAClC,sBAAsB,CAqBxB;AAED,wBAAgB,kBAAkB,CAAC,EAClC,OAAO,EACP,QAAQ,EACR,YAAY,GACZ,EAAE;IACF,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,EAAE,sBAAsB,CAAC;CACrC,GAAG,eAAe,EAAE,CA6GpB"}
|
|
@@ -0,0 +1,185 @@
|
|
|
1
|
+
import { isFunction, isMixin, } from '@arbor-css/functions';
|
|
2
|
+
import { DEFAULT_MODE_TOKEN_PREFIX, } from '@arbor-css/globals';
|
|
3
|
+
import { flattenToPropsList } from '@arbor-css/modes';
|
|
4
|
+
function escapeRegex(value) {
|
|
5
|
+
return value.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
|
|
6
|
+
}
|
|
7
|
+
function getLineStarts(content) {
|
|
8
|
+
const lineStarts = [0];
|
|
9
|
+
for (let i = 0; i < content.length; i += 1) {
|
|
10
|
+
if (content[i] === '\n') {
|
|
11
|
+
lineStarts.push(i + 1);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
return lineStarts;
|
|
15
|
+
}
|
|
16
|
+
function indexToLineColumn(index, lineStarts) {
|
|
17
|
+
let low = 0;
|
|
18
|
+
let high = lineStarts.length - 1;
|
|
19
|
+
while (low <= high) {
|
|
20
|
+
const mid = Math.floor((low + high) / 2);
|
|
21
|
+
const lineStart = lineStarts[mid];
|
|
22
|
+
const nextLineStart = mid + 1 < lineStarts.length ?
|
|
23
|
+
lineStarts[mid + 1]
|
|
24
|
+
: Number.POSITIVE_INFINITY;
|
|
25
|
+
if (index < lineStart) {
|
|
26
|
+
high = mid - 1;
|
|
27
|
+
continue;
|
|
28
|
+
}
|
|
29
|
+
if (index >= nextLineStart) {
|
|
30
|
+
low = mid + 1;
|
|
31
|
+
continue;
|
|
32
|
+
}
|
|
33
|
+
return {
|
|
34
|
+
line: mid + 1,
|
|
35
|
+
column: index - lineStart + 1,
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
return {
|
|
39
|
+
line: 1,
|
|
40
|
+
column: index + 1,
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
function addIssue(issues, seen, lineStarts, { name, kind, message, index, }) {
|
|
44
|
+
const key = `${kind}:${name}:${index}:${message}`;
|
|
45
|
+
if (seen.has(key)) {
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
seen.add(key);
|
|
49
|
+
const { line, column } = indexToLineColumn(index, lineStarts);
|
|
50
|
+
issues.push({
|
|
51
|
+
name,
|
|
52
|
+
kind,
|
|
53
|
+
message,
|
|
54
|
+
index,
|
|
55
|
+
line,
|
|
56
|
+
column,
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
export function createTokenMap(preset) {
|
|
60
|
+
const tokenMap = new Map();
|
|
61
|
+
for (const token of flattenToPropsList(preset.$)) {
|
|
62
|
+
tokenMap.set(token.name, token);
|
|
63
|
+
}
|
|
64
|
+
for (const fn of preset.functions ? Object.values(preset.functions) : []) {
|
|
65
|
+
tokenMap.set(fn.name, fn);
|
|
66
|
+
}
|
|
67
|
+
for (const mixin of preset.mixins ? Object.values(preset.mixins) : []) {
|
|
68
|
+
tokenMap.set(mixin.name, mixin);
|
|
69
|
+
}
|
|
70
|
+
return tokenMap;
|
|
71
|
+
}
|
|
72
|
+
export function createPrefixValidationConfig(tokenPrefixes) {
|
|
73
|
+
const configuredPrefixes = [
|
|
74
|
+
tokenPrefixes.modeTokenPrefix,
|
|
75
|
+
tokenPrefixes.primitiveTokenPrefix,
|
|
76
|
+
tokenPrefixes.metaTokenPrefix,
|
|
77
|
+
tokenPrefixes.refTokenPrefix,
|
|
78
|
+
tokenPrefixes.mixinTokenPrefix,
|
|
79
|
+
tokenPrefixes.functionNamePrefix,
|
|
80
|
+
tokenPrefixes.mixinNamePrefix,
|
|
81
|
+
].filter((value) => typeof value === 'string');
|
|
82
|
+
const declarationPrefixes = [...new Set(configuredPrefixes)];
|
|
83
|
+
if (declarationPrefixes.length === 0) {
|
|
84
|
+
declarationPrefixes.push(DEFAULT_MODE_TOKEN_PREFIX);
|
|
85
|
+
}
|
|
86
|
+
return {
|
|
87
|
+
tokenPrefixes: declarationPrefixes,
|
|
88
|
+
functionNamePrefix: tokenPrefixes.functionNamePrefix,
|
|
89
|
+
mixinNamePrefix: tokenPrefixes.mixinNamePrefix,
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
export function validateCssContent({ content, tokenMap, prefixConfig, }) {
|
|
93
|
+
const issues = [];
|
|
94
|
+
const seen = new Set();
|
|
95
|
+
const lineStarts = getLineStarts(content);
|
|
96
|
+
for (const prefix of prefixConfig.tokenPrefixes) {
|
|
97
|
+
const generalPropertyUsageRegex = new RegExp(`[\\s(](${escapeRegex(prefix)}[\\w-]+)[\\s)]`, 'gm');
|
|
98
|
+
for (const match of content.matchAll(generalPropertyUsageRegex)) {
|
|
99
|
+
if (match.index === undefined) {
|
|
100
|
+
continue;
|
|
101
|
+
}
|
|
102
|
+
const propertyName = match[1];
|
|
103
|
+
const index = match.index;
|
|
104
|
+
const matchedValue = tokenMap.get(propertyName);
|
|
105
|
+
if (!matchedValue) {
|
|
106
|
+
addIssue(issues, seen, lineStarts, {
|
|
107
|
+
name: propertyName,
|
|
108
|
+
kind: 'token',
|
|
109
|
+
message: `Unknown CSS property or Arbor token: ${propertyName}`,
|
|
110
|
+
index,
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
const declarationRegex = new RegExp(`(^|[;{\\s])(${escapeRegex(prefix)}[\\w-]+)\\s*:`, 'gm');
|
|
115
|
+
for (const match of content.matchAll(declarationRegex)) {
|
|
116
|
+
if (match.index === undefined) {
|
|
117
|
+
continue;
|
|
118
|
+
}
|
|
119
|
+
const name = match[2];
|
|
120
|
+
const index = match.index + match[1].length;
|
|
121
|
+
const matchedValue = tokenMap.get(name);
|
|
122
|
+
if (!matchedValue) {
|
|
123
|
+
addIssue(issues, seen, lineStarts, {
|
|
124
|
+
name,
|
|
125
|
+
kind: 'token',
|
|
126
|
+
message: `Unknown Arbor token: ${name}`,
|
|
127
|
+
index,
|
|
128
|
+
});
|
|
129
|
+
continue;
|
|
130
|
+
}
|
|
131
|
+
if (isFunction(matchedValue)) {
|
|
132
|
+
addIssue(issues, seen, lineStarts, {
|
|
133
|
+
name,
|
|
134
|
+
kind: 'token',
|
|
135
|
+
message: `Arbor functions cannot be used as property declarations: ${name}`,
|
|
136
|
+
index,
|
|
137
|
+
});
|
|
138
|
+
continue;
|
|
139
|
+
}
|
|
140
|
+
if (isMixin(matchedValue)) {
|
|
141
|
+
addIssue(issues, seen, lineStarts, {
|
|
142
|
+
name,
|
|
143
|
+
kind: 'token',
|
|
144
|
+
message: `Arbor mixins cannot be used as property declarations: ${name}`,
|
|
145
|
+
index,
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
const functionCallRegex = new RegExp(`(${escapeRegex(prefixConfig.functionNamePrefix)}[\\w-]+)\\s*\\(`, 'g');
|
|
151
|
+
for (const match of content.matchAll(functionCallRegex)) {
|
|
152
|
+
if (match.index === undefined) {
|
|
153
|
+
continue;
|
|
154
|
+
}
|
|
155
|
+
const name = match[1];
|
|
156
|
+
const matchedValue = tokenMap.get(name);
|
|
157
|
+
if (!matchedValue || !isFunction(matchedValue)) {
|
|
158
|
+
addIssue(issues, seen, lineStarts, {
|
|
159
|
+
name,
|
|
160
|
+
kind: 'function',
|
|
161
|
+
message: `Unknown Arbor function: ${name}`,
|
|
162
|
+
index: match.index,
|
|
163
|
+
});
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
const mixinApplyRegex = new RegExp(`@apply\\s+(${escapeRegex(prefixConfig.mixinNamePrefix)}[\\w-]+)`, 'g');
|
|
167
|
+
for (const match of content.matchAll(mixinApplyRegex)) {
|
|
168
|
+
if (match.index === undefined) {
|
|
169
|
+
continue;
|
|
170
|
+
}
|
|
171
|
+
const name = match[1];
|
|
172
|
+
const nameIndex = match.index + match[0].indexOf(name);
|
|
173
|
+
const matchedValue = tokenMap.get(name);
|
|
174
|
+
if (!matchedValue || !isMixin(matchedValue)) {
|
|
175
|
+
addIssue(issues, seen, lineStarts, {
|
|
176
|
+
name,
|
|
177
|
+
kind: 'mixin',
|
|
178
|
+
message: `Unknown Arbor mixin: ${name}`,
|
|
179
|
+
index: nameIndex,
|
|
180
|
+
});
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
return issues;
|
|
184
|
+
}
|
|
185
|
+
//# sourceMappingURL=validate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/cli/validate.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate.test.d.ts","sourceRoot":"","sources":["../../src/cli/validate.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import { createArbor } from '@arbor-css/preset';
|
|
2
|
+
import { expect, it } from 'vitest';
|
|
3
|
+
import { createPrefixValidationConfig, createTokenMap, validateCssContent, } from './validate.js';
|
|
4
|
+
function createTestPreset() {
|
|
5
|
+
const builder = createArbor({
|
|
6
|
+
modeTokenPrefix: '--x-',
|
|
7
|
+
primitiveTokenPrefix: '--xp-',
|
|
8
|
+
metaTokenPrefix: '--x_-',
|
|
9
|
+
refTokenPrefix: '--xref-',
|
|
10
|
+
functionNamePrefix: '--x-fn-',
|
|
11
|
+
mixinNamePrefix: '--x-mx-',
|
|
12
|
+
mixinTokenPrefix: '--x-mx-',
|
|
13
|
+
});
|
|
14
|
+
const double = builder.context.createFunction('double', {
|
|
15
|
+
parameters: ['--value'],
|
|
16
|
+
definition: ($, value) => $ `${value}`,
|
|
17
|
+
});
|
|
18
|
+
const fg = builder.context.createMixin('fg', {
|
|
19
|
+
parameters: ['--color'],
|
|
20
|
+
definition: (css, { parameters: [color] }) => ({
|
|
21
|
+
color: css `${color}`,
|
|
22
|
+
}),
|
|
23
|
+
});
|
|
24
|
+
return builder.preset({
|
|
25
|
+
color: {
|
|
26
|
+
mainColor: 'brand',
|
|
27
|
+
ranges: {
|
|
28
|
+
brand: {
|
|
29
|
+
hue: 120,
|
|
30
|
+
},
|
|
31
|
+
},
|
|
32
|
+
},
|
|
33
|
+
functions: { double },
|
|
34
|
+
mixins: { fg },
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
it('reports unknown declarations, functions, and mixins for configured prefixes', () => {
|
|
38
|
+
const preset = createTestPreset();
|
|
39
|
+
const issues = validateCssContent({
|
|
40
|
+
content: [
|
|
41
|
+
'.card {',
|
|
42
|
+
' --x-does-not-exist: 1px;',
|
|
43
|
+
' width: --x-fn-missing(1);',
|
|
44
|
+
' @apply --x-mx-missing;',
|
|
45
|
+
'}',
|
|
46
|
+
].join('\n'),
|
|
47
|
+
tokenMap: createTokenMap(preset),
|
|
48
|
+
prefixConfig: createPrefixValidationConfig(preset.context.tokenPrefixes),
|
|
49
|
+
});
|
|
50
|
+
expect(issues).toHaveLength(3);
|
|
51
|
+
expect(issues.map((issue) => issue.message)).toEqual(expect.arrayContaining([
|
|
52
|
+
'Unknown Arbor token: --x-does-not-exist',
|
|
53
|
+
'Unknown Arbor function: --x-fn-missing',
|
|
54
|
+
'Unknown Arbor mixin: --x-mx-missing',
|
|
55
|
+
]));
|
|
56
|
+
});
|
|
57
|
+
it('reports misuse when functions or mixins are used as declarations', () => {
|
|
58
|
+
const preset = createTestPreset();
|
|
59
|
+
const issues = validateCssContent({
|
|
60
|
+
content: [
|
|
61
|
+
'.card {',
|
|
62
|
+
' --x-fn-double: 1;',
|
|
63
|
+
' --x-mx-fg: red;',
|
|
64
|
+
'}',
|
|
65
|
+
].join('\n'),
|
|
66
|
+
tokenMap: createTokenMap(preset),
|
|
67
|
+
prefixConfig: createPrefixValidationConfig(preset.context.tokenPrefixes),
|
|
68
|
+
});
|
|
69
|
+
expect(issues).toHaveLength(2);
|
|
70
|
+
expect(issues.map((issue) => issue.message)).toEqual(expect.arrayContaining([
|
|
71
|
+
'Arbor functions cannot be used as property declarations: --x-fn-double',
|
|
72
|
+
'Arbor mixins cannot be used as property declarations: --x-mx-fg',
|
|
73
|
+
]));
|
|
74
|
+
});
|
|
75
|
+
it('accepts existing declarations, function calls, and mixin apply usage', () => {
|
|
76
|
+
const preset = createTestPreset();
|
|
77
|
+
const knownTokenName = preset.$.mode.spacing.md.name;
|
|
78
|
+
const issues = validateCssContent({
|
|
79
|
+
content: [
|
|
80
|
+
'.card {',
|
|
81
|
+
` ${knownTokenName}: 1rem;`,
|
|
82
|
+
' width: --x-fn-double(1);',
|
|
83
|
+
' @apply --x-mx-fg(red);',
|
|
84
|
+
'}',
|
|
85
|
+
].join('\n'),
|
|
86
|
+
tokenMap: createTokenMap(preset),
|
|
87
|
+
prefixConfig: createPrefixValidationConfig(preset.context.tokenPrefixes),
|
|
88
|
+
});
|
|
89
|
+
expect(issues).toEqual([]);
|
|
90
|
+
});
|
|
91
|
+
//# sourceMappingURL=validate.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate.test.js","sourceRoot":"","sources":["../../src/cli/validate.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { expect, it } from 'vitest';
|
|
|
4
4
|
import { getStructuredTokensMap } from './getStructuredTokensMap.js';
|
|
5
5
|
it('generates a map of mode, primitive, and system tokens with correct paths', () => {
|
|
6
6
|
const preset = createArbor().preset({
|
|
7
|
-
|
|
7
|
+
color: {
|
|
8
8
|
ranges: {
|
|
9
9
|
brand: {
|
|
10
10
|
hue: 80,
|
|
@@ -13,7 +13,7 @@ it('generates a map of mode, primitive, and system tokens with correct paths', (
|
|
|
13
13
|
mainColor: 'brand',
|
|
14
14
|
},
|
|
15
15
|
});
|
|
16
|
-
preset.primitives.
|
|
16
|
+
preset.primitives.color.light.colors.brand.mid;
|
|
17
17
|
const map = getStructuredTokensMap(preset);
|
|
18
18
|
expect(map.has('color.main.mid')).toBe(true);
|
|
19
19
|
expect(map.get('color.main.mid')).toBe(preset.$.mode.color.main.mid);
|
|
@@ -24,7 +24,7 @@ it('generates a map of mode, primitive, and system tokens with correct paths', (
|
|
|
24
24
|
});
|
|
25
25
|
it('applies descriptions to all built-in system and global tokens', () => {
|
|
26
26
|
const preset = createArbor().preset({
|
|
27
|
-
|
|
27
|
+
color: {
|
|
28
28
|
ranges: {
|
|
29
29
|
brand: {
|
|
30
30
|
hue: 80,
|
|
@@ -35,6 +35,6 @@ it('applies descriptions to all built-in system and global tokens', () => {
|
|
|
35
35
|
});
|
|
36
36
|
const tokens = tokenSchemaToList(preset.$.system);
|
|
37
37
|
expect(tokens.every((token) => typeof token.description === 'string' && token.description.length > 0)).toBe(true);
|
|
38
|
-
expect(preset.$.system.global.baseFontSize.description).
|
|
38
|
+
expect(preset.$.system.global.baseFontSize.description).toBeDefined();
|
|
39
39
|
});
|
|
40
40
|
//# sourceMappingURL=getStructuredTokensMap.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getStructuredTokensMap.test.js","sourceRoot":"","sources":["../src/getStructuredTokensMap.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,EAAE,CAAC,0EAA0E,EAAE,GAAG,EAAE;IACnF,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC,MAAM,CAAC;QACnC,
|
|
1
|
+
{"version":3,"file":"getStructuredTokensMap.test.js","sourceRoot":"","sources":["../src/getStructuredTokensMap.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,EAAE,CAAC,0EAA0E,EAAE,GAAG,EAAE;IACnF,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC,MAAM,CAAC;QACnC,KAAK,EAAE;YACN,MAAM,EAAE;gBACP,KAAK,EAAE;oBACN,GAAG,EAAE,EAAE;iBACP;aACD;YACD,SAAS,EAAE,OAAO;SAClB;KACD,CAAC,CAAC;IACH,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;IAC/C,MAAM,GAAG,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAE3C,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAC/E,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;IACxE,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC,MAAM,CAAC;QACnC,KAAK,EAAE;YACN,MAAM,EAAE;gBACP,KAAK,EAAE;oBACN,GAAG,EAAE,EAAE;iBACP;aACD;YACD,SAAS,EAAE,OAAO;SAClB;KACD,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAElD,MAAM,CACL,MAAM,CAAC,KAAK,CACX,CAAC,KAAK,EAAE,EAAE,CACT,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ,IAAI,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CACtE,CACD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACb,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC;AACvE,CAAC,CAAC,CAAC"}
|
|
@@ -11,8 +11,8 @@ class GlobalsEditor extends ArborElement {
|
|
|
11
11
|
const globalsFolder = gui.addFolder('Globals');
|
|
12
12
|
for (const [globalKey, token] of Object.entries(config.$.system.global)) {
|
|
13
13
|
let entry = token.type === 'color' ?
|
|
14
|
-
globalsFolder.addColor(config.primitives.
|
|
15
|
-
: globalsFolder.add(config.primitives.
|
|
14
|
+
globalsFolder.addColor(config.primitives.global, globalKey)
|
|
15
|
+
: globalsFolder.add(config.primitives.global, globalKey);
|
|
16
16
|
entry.name(globalKey).onChange((v) => {
|
|
17
17
|
document.documentElement.style.setProperty(token.name, v.toString());
|
|
18
18
|
});
|
|
@@ -28,7 +28,7 @@ class GlobalsEditor extends ArborElement {
|
|
|
28
28
|
entry.name(key).onChange((v) => {
|
|
29
29
|
document.documentElement.style.setProperty(token.name, v.toString());
|
|
30
30
|
// and all scheme permutations...
|
|
31
|
-
for (const scheme of Object.keys(config.primitives.
|
|
31
|
+
for (const scheme of Object.keys(config.primitives.color)) {
|
|
32
32
|
const prefix = config.primitives.schemeTags[scheme] ?? scheme;
|
|
33
33
|
document.documentElement.style.setProperty(token.prefixed(prefix).name, v.toString());
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GlobalsEditor.js","sourceRoot":"","sources":["../../../src/runtime/components/GlobalsEditor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,mBAAmB,CAAC;AACnD,OAAO,GAAG,MAAM,SAAS,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,aAAc,SAAQ,YAAY;IACvC,iBAAiB;QAChB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,GAAG,CAAC,KAAK,EAAE,CAAC;QACZ,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAE3B,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAE/C,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACzE,IAAI,KAAK,GACR,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;gBACvB,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"GlobalsEditor.js","sourceRoot":"","sources":["../../../src/runtime/components/GlobalsEditor.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ class SchemeSelector extends ArborElement {
|
|
|
3
3
|
constructor() {
|
|
4
4
|
super();
|
|
5
5
|
this.render = () => {
|
|
6
|
-
const schemeNames = Object.keys(this.config.primitives.
|
|
6
|
+
const schemeNames = Object.keys(this.config.primitives.color);
|
|
7
7
|
const selected = this.getAttribute('selected') || 'base';
|
|
8
8
|
this.shadowRoot.innerHTML = `<div data-scheme-${selected}>
|
|
9
9
|
<select data-scheme-select name="scheme" aria-label="Select scheme" style="position: sticky; top: 0;">
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemeSelector.js","sourceRoot":"","sources":["../../../src/runtime/components/SchemeSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,cAAe,SAAQ,YAAY;IACxC;QACC,KAAK,EAAE,CAAC;QAIT,WAAM,GAAG,GAAG,EAAE;YACb,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"SchemeSelector.js","sourceRoot":"","sources":["../../../src/runtime/components/SchemeSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,cAAe,SAAQ,YAAY;IACxC;QACC,KAAK,EAAE,CAAC;QAIT,WAAM,GAAG,GAAG,EAAE;YACb,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC;YACzD,IAAI,CAAC,UAAW,CAAC,SAAS,GAAG,oBAAoB,QAAQ;;MAErD,WAAW;iBACX,GAAG,CACH,CAAC,UAAU,EAAE,EAAE,CACd,kBAAkB,UAAU,KAAK,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,UAAU,WAAW,CACpG;iBACA,IAAI,CAAC,IAAI,CAAC;;;SAGP,CAAC;YACR,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,aAAa,CAChD,sBAAsB,CACM,CAAC;YAC9B,UAAU,EAAE,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE;gBAC3C,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC;gBACtC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QAxBD,IAAI,CAAC,MAAM,EAAE,CAAC;IACf,CAAC;IAwBD,MAAM,KAAK,kBAAkB;QAC5B,OAAO,CAAC,UAAU,CAAC,CAAC;IACrB,CAAC;IACD,wBAAwB,CACvB,IAAY,EACZ,QAAuB,EACvB,QAAuB;QAEvB,IAAI,IAAI,KAAK,UAAU,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAClD,IAAI,CAAC,MAAM,EAAE,CAAC;QACf,CAAC;IACF,CAAC;CACD;AAED,cAAc,CAAC,MAAM,CAAC,uBAAuB,EAAE,cAAc,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateStylesheet.d.ts","sourceRoot":"","sources":["../../src/stylesheet/generateStylesheet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAa1D,wBAAgB,kBAAkB,CACjC,MAAM,EAAE,cAAc,EACtB,EACC,KAAK,EAAE,gBAA0B,GACjC,GAAE;IACF,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CAClB,GACJ,MAAM,
|
|
1
|
+
{"version":3,"file":"generateStylesheet.d.ts","sourceRoot":"","sources":["../../src/stylesheet/generateStylesheet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAa1D,wBAAgB,kBAAkB,CACjC,MAAM,EAAE,cAAc,EACtB,EACC,KAAK,EAAE,gBAA0B,GACjC,GAAE;IACF,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CAClB,GACJ,MAAM,CA6IR"}
|
|
@@ -17,12 +17,12 @@ export function generateStylesheet(config, { layer: cascadeLayerName = 'arbor',
|
|
|
17
17
|
* tagged one when it is applied.
|
|
18
18
|
*/
|
|
19
19
|
function getSchemeRootPropertiesCss(schemeName) {
|
|
20
|
-
const values = flattenAndApplyTokenValues(config.$.primitives.
|
|
20
|
+
const values = flattenAndApplyTokenValues(config.$.primitives.color, config.primitives.color[schemeName].colors, { prefix: config.primitives.schemeTags[schemeName] ?? schemeName });
|
|
21
21
|
return formatObjectToCss(values);
|
|
22
22
|
}
|
|
23
23
|
function schemeApplicationCss(schemeName) {
|
|
24
|
-
const scheme = config.primitives.
|
|
25
|
-
const values = selfReferencedProps(config.$.primitives.
|
|
24
|
+
const scheme = config.primitives.color[schemeName];
|
|
25
|
+
const values = selfReferencedProps(config.$.primitives.color, {
|
|
26
26
|
valuePrefix: config.primitives.schemeTags[schemeName] ?? schemeName,
|
|
27
27
|
});
|
|
28
28
|
return `${systemProps.meta.schemeName.assign(schemeName)}
|
|
@@ -39,9 +39,9 @@ export function generateStylesheet(config, { layer: cascadeLayerName = 'arbor',
|
|
|
39
39
|
return flattenToPropsList(shape);
|
|
40
40
|
})));
|
|
41
41
|
// replace scheme names with their tags if they are provided
|
|
42
|
-
const schemeColorsWithTags = Object.keys(config.primitives.
|
|
42
|
+
const schemeColorsWithTags = Object.keys(config.primitives.color).reduce((acc, scheme) => {
|
|
43
43
|
const key = config.primitives.schemeTags[scheme] ?? scheme;
|
|
44
|
-
acc[key] = config.primitives.
|
|
44
|
+
acc[key] = config.primitives.color[scheme].colors;
|
|
45
45
|
return acc;
|
|
46
46
|
}, {});
|
|
47
47
|
// convert all tagged scheme colors to Tokens
|
|
@@ -51,12 +51,12 @@ export function generateStylesheet(config, { layer: cascadeLayerName = 'arbor',
|
|
|
51
51
|
${cascadeLayerName ? `@layer ${cascadeLayerName} {` : ''}
|
|
52
52
|
:root {
|
|
53
53
|
/* Assign user globals */
|
|
54
|
-
${printTokens(globalProps, config.primitives.
|
|
54
|
+
${printTokens(globalProps, config.primitives.global)}
|
|
55
55
|
/* By default we set the font size */
|
|
56
56
|
font-size: ${globalProps.baseFontSize.var};
|
|
57
57
|
|
|
58
58
|
/* Raw scheme ranges */
|
|
59
|
-
${Object.keys(config.primitives.
|
|
59
|
+
${Object.keys(config.primitives.color)
|
|
60
60
|
.map((schemeName) => getSchemeRootPropertiesCss(schemeName))
|
|
61
61
|
.join('\n')}
|
|
62
62
|
|
|
@@ -72,11 +72,13 @@ ${cascadeLayerName ? `@layer ${cascadeLayerName} {` : ''}
|
|
|
72
72
|
/* Other primitives */
|
|
73
73
|
${printTokens(config.$.primitives.typography, config.primitives.typography.levels)}
|
|
74
74
|
${printTokens(config.$.primitives.spacing, config.primitives.spacing.levels)}
|
|
75
|
-
${printTokens(config.$.primitives.
|
|
75
|
+
${printTokens(config.$.primitives.shadow, config.primitives.shadow.levels)}
|
|
76
|
+
${printTokens(config.$.primitives.easing, config.primitives.easing)}
|
|
77
|
+
${printTokens(config.$.primitives.duration, config.primitives.duration)}
|
|
76
78
|
}
|
|
77
79
|
|
|
78
80
|
/* Scheme classes */
|
|
79
|
-
${Object.keys(config.primitives.
|
|
81
|
+
${Object.keys(config.primitives.color)
|
|
80
82
|
.map((schemeName) => `.\\@scheme-${schemeName}, [data-scheme-${schemeName}=""] {
|
|
81
83
|
${schemeApplicationCss(schemeName)}
|
|
82
84
|
}`)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateStylesheet.js","sourceRoot":"","sources":["../../src/stylesheet/generateStylesheet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EACN,OAAO,EACP,mBAAmB,EACnB,iBAAiB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,MAAM,YAAY,GAAG,yCAAyC,CAAC;AAE/D,MAAM,UAAU,kBAAkB,CACjC,MAAsB,EACtB,EACC,KAAK,EAAE,gBAAgB,GAAG,OAAO,MAG9B,EAAE;IAEN,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,IAAI,OAAO,CAAC;IACjE,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;IACnC,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IACpC,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC;IAEvC;;;;;OAKG;IACH,SAAS,0BAA0B,CAAC,UAAkB;QACrD,MAAM,MAAM,GAAG,0BAA0B,CACxC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"generateStylesheet.js","sourceRoot":"","sources":["../../src/stylesheet/generateStylesheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,14 +3,14 @@ import { isToken } from '@arbor-css/tokens';
|
|
|
3
3
|
import { flattenAndApplyTokenValues } from './flattenAndApplyTokenValues.js';
|
|
4
4
|
export function resolveTokenReferences(preset, tokenName, colorScheme = 'light') {
|
|
5
5
|
const flat = flattenAndApplyTokenValues({
|
|
6
|
-
colors: preset.$.primitives.
|
|
7
|
-
shadows: preset.$.primitives.
|
|
6
|
+
colors: preset.$.primitives.color,
|
|
7
|
+
shadows: preset.$.primitives.shadow,
|
|
8
8
|
spacing: preset.$.primitives.spacing,
|
|
9
9
|
typography: preset.$.primitives.typography,
|
|
10
10
|
mode: preset.$.mode,
|
|
11
11
|
}, {
|
|
12
|
-
colors: preset.primitives.
|
|
13
|
-
shadows: preset.primitives.
|
|
12
|
+
colors: preset.primitives.color[colorScheme].colors,
|
|
13
|
+
shadows: preset.primitives.shadow.levels,
|
|
14
14
|
spacing: preset.primitives.spacing.levels,
|
|
15
15
|
typography: preset.primitives.typography.levels,
|
|
16
16
|
mode: preset.modes.base.values,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveTokenReferences.js","sourceRoot":"","sources":["../../src/util/resolveTokenReferences.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,MAAM,UAAU,sBAAsB,CACrC,MAA6B,EAC7B,SAAiB,EACjB,cAAsB,OAAO;IAE7B,MAAM,IAAI,GAAG,0BAA0B,CACtC;QACC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"resolveTokenReferences.js","sourceRoot":"","sources":["../../src/util/resolveTokenReferences.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,MAAM,UAAU,sBAAsB,CACrC,MAA6B,EAC7B,SAAiB,EACjB,cAAsB,OAAO;IAE7B,MAAM,IAAI,GAAG,0BAA0B,CACtC;QACC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK;QACjC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM;QACnC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO;QACpC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU;QAC1C,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI;KACnB,EACD;QACC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,MAAM;QACnD,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM;QACxC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM;QACzC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM;QAC/C,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM;KAC9B,CACD,CAAC;IAEF,IAAI,OAAO,GAAG,SAAS,CAAC;IACxB,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,OAAO,OAAO,EAAE,CAAC;QAChB,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,qBAAqB;YACrB,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAErB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACpB,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC;QACtB,CAAC;aAAM,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,mDAAmD;YACnD,kCAAkC;YAClC,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;YACrC,MAAM,QAAQ,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,OAAO,SAAS,CAAC;YAClB,CAAC;YACD,OAAO,GAAG,QAAQ,CAAC;QACpB,CAAC;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACtC,oDAAoD;YACpD,MAAM,QAAQ,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;YAC/C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,OAAO,KAAK,CAAC;YACd,CAAC;YACD,OAAO,GAAG,QAAQ,CAAC;QACpB,CAAC;aAAM,CAAC;YACP,yBAAyB;YACzB,OAAO,SAAS,CAAC;QAClB,CAAC;IACF,CAAC;AACF,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAa;IAC5C,MAAM,KAAK,GAAG,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAChC,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { createArbor } from '@arbor-css/preset';
|
|
|
2
2
|
import { expect, it } from 'vitest';
|
|
3
3
|
import { resolveTokenReferences } from './resolveTokenReferences.js';
|
|
4
4
|
const preset = createArbor().preset({
|
|
5
|
-
|
|
5
|
+
color: {
|
|
6
6
|
mainColor: 'red',
|
|
7
7
|
ranges: {
|
|
8
8
|
red: {
|
|
@@ -12,7 +12,7 @@ const preset = createArbor().preset({
|
|
|
12
12
|
},
|
|
13
13
|
});
|
|
14
14
|
it('resolves a indirect token values', () => {
|
|
15
|
-
expect(resolveTokenReferences(preset, preset.$.primitives.
|
|
15
|
+
expect(resolveTokenReferences(preset, preset.$.primitives.color.red.$root.name)).toBe('oklch(90% 0.15000000000000002 0)');
|
|
16
16
|
});
|
|
17
17
|
it('resolves direct token values', () => {
|
|
18
18
|
expect(resolveTokenReferences(preset, preset.$.primitives.spacing.$root.name)).toBe('0.5rem');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveTokenReferences.test.js","sourceRoot":"","sources":["../../src/util/resolveTokenReferences.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC,MAAM,CAAC;IACnC,
|
|
1
|
+
{"version":3,"file":"resolveTokenReferences.test.js","sourceRoot":"","sources":["../../src/util/resolveTokenReferences.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC,MAAM,CAAC;IACnC,KAAK,EAAE;QACN,SAAS,EAAE,KAAK;QAChB,MAAM,EAAE;YACP,GAAG,EAAE;gBACJ,GAAG,EAAE,CAAC;aACN;SACD;KACD;CACD,CAAC,CAAC;AAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAC3C,MAAM,CACL,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CACxE,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;IACvC,MAAM,CACL,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CACtE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACrC,MAAM,CACL,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CACnE,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@arbor-css/core",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.72",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -41,18 +41,18 @@
|
|
|
41
41
|
"jiti": "^2.6.1",
|
|
42
42
|
"lil-gui": "^0.21.0",
|
|
43
43
|
"yargs": "^18.0.0",
|
|
44
|
-
"@arbor-css/
|
|
45
|
-
"@arbor-css/
|
|
46
|
-
"@arbor-css/
|
|
47
|
-
"@arbor-css/
|
|
48
|
-
"@arbor-css/
|
|
49
|
-
"@arbor-css/typography": "0.0.
|
|
50
|
-
"@arbor-css/
|
|
51
|
-
"@arbor-css/
|
|
52
|
-
"@arbor-css/
|
|
53
|
-
"@arbor-css/
|
|
54
|
-
"@arbor-css/functions": "0.0.
|
|
55
|
-
"@arbor-css/calc": "0.0.
|
|
44
|
+
"@arbor-css/tokens": "0.0.72",
|
|
45
|
+
"@arbor-css/preset": "0.0.72",
|
|
46
|
+
"@arbor-css/globals": "0.0.72",
|
|
47
|
+
"@arbor-css/colors": "0.0.72",
|
|
48
|
+
"@arbor-css/modes": "0.0.72",
|
|
49
|
+
"@arbor-css/typography": "0.0.72",
|
|
50
|
+
"@arbor-css/spacing": "0.0.72",
|
|
51
|
+
"@arbor-css/primitives": "0.0.72",
|
|
52
|
+
"@arbor-css/util": "0.0.72",
|
|
53
|
+
"@arbor-css/shadows": "0.0.72",
|
|
54
|
+
"@arbor-css/functions": "0.0.72",
|
|
55
|
+
"@arbor-css/calc": "0.0.72"
|
|
56
56
|
},
|
|
57
57
|
"scripts": {
|
|
58
58
|
"build": "tsc",
|