@terrazzo/parser 2.0.0-beta.6 → 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 +19 -14
- package/dist/index.js.map +1 -1
- package/package.json +4 -4
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
|
@@ -2561,7 +2561,7 @@ function normalize(token, { logger, src }) {
|
|
|
2561
2561
|
logger.warn({
|
|
2562
2562
|
...entry,
|
|
2563
2563
|
node,
|
|
2564
|
-
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.`
|
|
2565
2565
|
});
|
|
2566
2566
|
try {
|
|
2567
2567
|
return parseColor(value);
|
|
@@ -3015,7 +3015,7 @@ function resolveAliases(tokens, { logger, refMap, sources }) {
|
|
|
3015
3015
|
|
|
3016
3016
|
//#endregion
|
|
3017
3017
|
//#region src/parse/process.ts
|
|
3018
|
-
function processTokens(rootSource, { config, logger, sourceByFilename, isResolver }) {
|
|
3018
|
+
function processTokens(rootSource, { config, logger, sourceByFilename, resolveAliases: shouldResolveAliases = true, isResolver }) {
|
|
3019
3019
|
const entry = {
|
|
3020
3020
|
group: "parser",
|
|
3021
3021
|
label: "init"
|
|
@@ -3122,6 +3122,7 @@ function processTokens(rootSource, { config, logger, sourceByFilename, isResolve
|
|
|
3122
3122
|
});
|
|
3123
3123
|
flatten$extends(extended, chain);
|
|
3124
3124
|
replaceNode(node, mergeObjects(extended, node));
|
|
3125
|
+
node.members = node.members.filter((n) => !(n.name.type === "String" && n.name.value === "$extends"));
|
|
3125
3126
|
}
|
|
3126
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) {
|
|
3127
3128
|
if (subnode.type === "Object") flatten$extends(subnode, chain);
|
|
@@ -3177,16 +3178,18 @@ function processTokens(rootSource, { config, logger, sourceByFilename, isResolve
|
|
|
3177
3178
|
}
|
|
3178
3179
|
}
|
|
3179
3180
|
} });
|
|
3180
|
-
|
|
3181
|
-
|
|
3182
|
-
|
|
3183
|
-
|
|
3184
|
-
|
|
3185
|
-
|
|
3186
|
-
|
|
3187
|
-
|
|
3188
|
-
|
|
3189
|
-
|
|
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
|
+
}
|
|
3190
3193
|
const aliasStart = performance.now();
|
|
3191
3194
|
graphAliases(refMap, {
|
|
3192
3195
|
tokens,
|
|
@@ -3966,7 +3969,7 @@ function simpleFlatten(tokens, { logger }) {
|
|
|
3966
3969
|
//#endregion
|
|
3967
3970
|
//#region src/parse/load.ts
|
|
3968
3971
|
/** Load from multiple entries, while resolving remote files */
|
|
3969
|
-
async function loadSources(inputs, { config, logger, req, continueOnError, yamlToMomoa, transform }) {
|
|
3972
|
+
async function loadSources(inputs, { config, logger, req, continueOnError, yamlToMomoa, resolveAliases = true, transform }) {
|
|
3970
3973
|
const entry = {
|
|
3971
3974
|
group: "parser",
|
|
3972
3975
|
label: "init"
|
|
@@ -4021,6 +4024,7 @@ async function loadSources(inputs, { config, logger, req, continueOnError, yamlT
|
|
|
4021
4024
|
}, {
|
|
4022
4025
|
config,
|
|
4023
4026
|
logger,
|
|
4027
|
+
resolveAliases,
|
|
4024
4028
|
sources,
|
|
4025
4029
|
sourceByFilename
|
|
4026
4030
|
}),
|
|
@@ -4075,7 +4079,7 @@ function transformer(transform) {
|
|
|
4075
4079
|
//#endregion
|
|
4076
4080
|
//#region src/parse/index.ts
|
|
4077
4081
|
/** Parse */
|
|
4078
|
-
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 } = {}) {
|
|
4079
4083
|
const inputs = Array.isArray(_input) ? _input : [_input];
|
|
4080
4084
|
let tokens = {};
|
|
4081
4085
|
let resolver;
|
|
@@ -4109,6 +4113,7 @@ async function parse(_input, { logger = new Logger(), req = defaultReq, skipLint
|
|
|
4109
4113
|
config,
|
|
4110
4114
|
continueOnError,
|
|
4111
4115
|
yamlToMomoa,
|
|
4116
|
+
resolveAliases,
|
|
4112
4117
|
transform
|
|
4113
4118
|
});
|
|
4114
4119
|
tokens = tokenResult.tokens;
|