@terrazzo/parser 2.0.0-beta.5 → 2.0.0-rc.0
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/CHANGELOG.md +2 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +37 -29
- package/dist/index.js.map +1 -1
- package/package.json +4 -5
package/CHANGELOG.md
CHANGED
|
@@ -81,6 +81,8 @@ The 2.0.0 release is full of new features:
|
|
|
81
81
|
|
|
82
82
|
- Thanks [@drwpow](https://github.com/drwpow)! - Improve extended typography property CSS generation
|
|
83
83
|
|
|
84
|
+
- Bugfix: An error is now thrown if `--config [path]` points to a bad location.
|
|
85
|
+
|
|
84
86
|
## 0.10.4
|
|
85
87
|
|
|
86
88
|
### Patch Changes
|
package/dist/index.d.ts
CHANGED
|
@@ -322,6 +322,8 @@ interface ParseOptions {
|
|
|
322
322
|
transform?: TransformVisitors;
|
|
323
323
|
/** (internal cache; do not use) */
|
|
324
324
|
_sources?: Record<string, InputSourceWithDocument>;
|
|
325
|
+
/** Resolve DTCG aliases? You’d typically only pass in `false` when normalizing or performing partial parsing. */
|
|
326
|
+
resolveAliases?: boolean;
|
|
325
327
|
}
|
|
326
328
|
interface Plugin {
|
|
327
329
|
name: string;
|
|
@@ -553,6 +555,7 @@ declare function parse(_input: InputSource | InputSource[], {
|
|
|
553
555
|
skipLint,
|
|
554
556
|
config,
|
|
555
557
|
continueOnError,
|
|
558
|
+
resolveAliases,
|
|
556
559
|
yamlToMomoa,
|
|
557
560
|
transform
|
|
558
561
|
}?: ParseOptions): Promise<ParseResult>;
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","names":[],"sources":["../src/logger.ts","../src/types.ts","../src/build/index.ts","../src/config.ts","../src/lint/plugin-core/index.ts","../src/lint/index.ts","../src/parse/index.ts","../src/resolver/load.ts","../src/resolver/normalize.ts","../src/resolver/validate.ts"],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.d.ts","names":[],"sources":["../src/logger.ts","../src/types.ts","../src/build/index.ts","../src/config.ts","../src/lint/plugin-core/index.ts","../src/lint/index.ts","../src/parse/index.ts","../src/resolver/load.ts","../src/resolver/normalize.ts","../src/resolver/validate.ts"],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -309,20 +309,23 @@ async function build(tokens, { resolver, sources, logger = new Logger(), config
|
|
|
309
309
|
},
|
|
310
310
|
pluginName: plugin.name
|
|
311
311
|
});
|
|
312
|
-
if (!formats[params.format]) formats[params.format] = {};
|
|
312
|
+
if (!formats[params.format]) formats[params.format] = { [FALLBACK_PERMUTATION_ID]: [] };
|
|
313
313
|
if (!formats[params.format][permutationID]) formats[params.format][permutationID] = [];
|
|
314
314
|
const foundTokenI = formats[params.format][permutationID].findIndex((t) => id === t.id && (!params.localID || params.localID === t.localID) && (!mode || t.mode === mode));
|
|
315
|
-
if (foundTokenI === -1)
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
315
|
+
if (foundTokenI === -1) {
|
|
316
|
+
const transformedToken = {
|
|
317
|
+
...params,
|
|
318
|
+
id,
|
|
319
|
+
value: cleanValue,
|
|
320
|
+
type: typeof cleanValue === "string" ? SINGLE_VALUE : MULTI_VALUE,
|
|
321
|
+
mode: mode || ".",
|
|
322
|
+
token: makeReadOnlyToken(token),
|
|
323
|
+
permutationID,
|
|
324
|
+
input: JSON.parse(permutationID)
|
|
325
|
+
};
|
|
326
|
+
formats[params.format][permutationID].push(transformedToken);
|
|
327
|
+
if (params.input && !Object.keys(params.input).length && permutationID !== FALLBACK_PERMUTATION_ID) formats[params.format][FALLBACK_PERMUTATION_ID].push(transformedToken);
|
|
328
|
+
} else {
|
|
326
329
|
formats[params.format][permutationID][foundTokenI].value = cleanValue;
|
|
327
330
|
formats[params.format][permutationID][foundTokenI].type = typeof cleanValue === "string" ? SINGLE_VALUE : MULTI_VALUE;
|
|
328
331
|
}
|
|
@@ -2392,14 +2395,14 @@ async function lintRunner({ tokens, filename, config = {}, sources, logger }) {
|
|
|
2392
2395
|
let message = "";
|
|
2393
2396
|
if (!descriptor.message && !descriptor.messageId) logger.error({
|
|
2394
2397
|
group: "lint",
|
|
2395
|
-
label: `${plugin.name}
|
|
2398
|
+
label: `${plugin.name}:${id}`,
|
|
2396
2399
|
message: "Unable to report error: missing message or messageId"
|
|
2397
2400
|
});
|
|
2398
2401
|
if (descriptor.message) message = descriptor.message;
|
|
2399
2402
|
else {
|
|
2400
2403
|
if (!(descriptor.messageId in (rule.meta?.messages ?? {}))) logger.error({
|
|
2401
2404
|
group: "lint",
|
|
2402
|
-
label: `${plugin.name}
|
|
2405
|
+
label: `${plugin.name}:${id}`,
|
|
2403
2406
|
message: `messageId "${descriptor.messageId}" does not exist`
|
|
2404
2407
|
});
|
|
2405
2408
|
message = rule.meta?.messages?.[descriptor.messageId] ?? "";
|
|
@@ -2558,7 +2561,7 @@ function normalize(token, { logger, src }) {
|
|
|
2558
2561
|
logger.warn({
|
|
2559
2562
|
...entry,
|
|
2560
2563
|
node,
|
|
2561
|
-
message: `${token.id}: string colors will be deprecated in a future version. Please update to object notation
|
|
2564
|
+
message: `${token.id}: string colors will be deprecated in a future version. Please update to object notation.`
|
|
2562
2565
|
});
|
|
2563
2566
|
try {
|
|
2564
2567
|
return parseColor(value);
|
|
@@ -3012,7 +3015,7 @@ function resolveAliases(tokens, { logger, refMap, sources }) {
|
|
|
3012
3015
|
|
|
3013
3016
|
//#endregion
|
|
3014
3017
|
//#region src/parse/process.ts
|
|
3015
|
-
function processTokens(rootSource, { config, logger, sourceByFilename, isResolver }) {
|
|
3018
|
+
function processTokens(rootSource, { config, logger, sourceByFilename, resolveAliases: shouldResolveAliases = true, isResolver }) {
|
|
3016
3019
|
const entry = {
|
|
3017
3020
|
group: "parser",
|
|
3018
3021
|
label: "init"
|
|
@@ -3119,6 +3122,7 @@ function processTokens(rootSource, { config, logger, sourceByFilename, isResolve
|
|
|
3119
3122
|
});
|
|
3120
3123
|
flatten$extends(extended, chain);
|
|
3121
3124
|
replaceNode(node, mergeObjects(extended, node));
|
|
3125
|
+
node.members = node.members.filter((n) => !(n.name.type === "String" && n.name.value === "$extends"));
|
|
3122
3126
|
}
|
|
3123
3127
|
for (const member of node.members) if (member.value.type === "Object" && member.name.type === "String" && !["$value", "$extensions"].includes(member.name.value)) traverse(member.value, { enter(subnode, _parent) {
|
|
3124
3128
|
if (subnode.type === "Object") flatten$extends(subnode, chain);
|
|
@@ -3136,7 +3140,7 @@ function processTokens(rootSource, { config, logger, sourceByFilename, isResolve
|
|
|
3136
3140
|
const tokenIDs = [];
|
|
3137
3141
|
const groups = {};
|
|
3138
3142
|
traverse(rootSource.document, { enter(node, _parent, rawPath) {
|
|
3139
|
-
if (node.type !== "Object") return;
|
|
3143
|
+
if (node.type !== "Object" || rawPath.includes("$value") || rawPath.includes("$extensions")) return;
|
|
3140
3144
|
groupFromNode(node, {
|
|
3141
3145
|
path: isResolver ? filterResolverPaths(rawPath) : rawPath,
|
|
3142
3146
|
groups
|
|
@@ -3174,16 +3178,18 @@ function processTokens(rootSource, { config, logger, sourceByFilename, isResolve
|
|
|
3174
3178
|
}
|
|
3175
3179
|
}
|
|
3176
3180
|
} });
|
|
3177
|
-
|
|
3178
|
-
|
|
3179
|
-
|
|
3180
|
-
|
|
3181
|
-
|
|
3182
|
-
|
|
3183
|
-
|
|
3184
|
-
|
|
3185
|
-
|
|
3186
|
-
|
|
3181
|
+
if (shouldResolveAliases) {
|
|
3182
|
+
resolveAliases(tokens, {
|
|
3183
|
+
logger,
|
|
3184
|
+
sources: sourceByFilename,
|
|
3185
|
+
refMap
|
|
3186
|
+
});
|
|
3187
|
+
logger.debug({
|
|
3188
|
+
...entry,
|
|
3189
|
+
message: "Parsing: 2nd pass",
|
|
3190
|
+
timing: performance.now() - secondPass
|
|
3191
|
+
});
|
|
3192
|
+
}
|
|
3187
3193
|
const aliasStart = performance.now();
|
|
3188
3194
|
graphAliases(refMap, {
|
|
3189
3195
|
tokens,
|
|
@@ -3963,7 +3969,7 @@ function simpleFlatten(tokens, { logger }) {
|
|
|
3963
3969
|
//#endregion
|
|
3964
3970
|
//#region src/parse/load.ts
|
|
3965
3971
|
/** Load from multiple entries, while resolving remote files */
|
|
3966
|
-
async function loadSources(inputs, { config, logger, req, continueOnError, yamlToMomoa, transform }) {
|
|
3972
|
+
async function loadSources(inputs, { config, logger, req, continueOnError, yamlToMomoa, resolveAliases = true, transform }) {
|
|
3967
3973
|
const entry = {
|
|
3968
3974
|
group: "parser",
|
|
3969
3975
|
label: "init"
|
|
@@ -4018,6 +4024,7 @@ async function loadSources(inputs, { config, logger, req, continueOnError, yamlT
|
|
|
4018
4024
|
}, {
|
|
4019
4025
|
config,
|
|
4020
4026
|
logger,
|
|
4027
|
+
resolveAliases,
|
|
4021
4028
|
sources,
|
|
4022
4029
|
sourceByFilename
|
|
4023
4030
|
}),
|
|
@@ -4072,7 +4079,7 @@ function transformer(transform) {
|
|
|
4072
4079
|
//#endregion
|
|
4073
4080
|
//#region src/parse/index.ts
|
|
4074
4081
|
/** Parse */
|
|
4075
|
-
async function parse(_input, { logger = new Logger(), req = defaultReq, skipLint = false, config = {}, continueOnError = false, yamlToMomoa, transform } = {}) {
|
|
4082
|
+
async function parse(_input, { logger = new Logger(), req = defaultReq, skipLint = false, config = {}, continueOnError = false, resolveAliases = true, yamlToMomoa, transform } = {}) {
|
|
4076
4083
|
const inputs = Array.isArray(_input) ? _input : [_input];
|
|
4077
4084
|
let tokens = {};
|
|
4078
4085
|
let resolver;
|
|
@@ -4106,6 +4113,7 @@ async function parse(_input, { logger = new Logger(), req = defaultReq, skipLint
|
|
|
4106
4113
|
config,
|
|
4107
4114
|
continueOnError,
|
|
4108
4115
|
yamlToMomoa,
|
|
4116
|
+
resolveAliases,
|
|
4109
4117
|
transform
|
|
4110
4118
|
});
|
|
4111
4119
|
tokens = tokenResult.tokens;
|