@terrazzo/cli 0.2.7 → 0.2.8
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/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +10 -0
- package/dist/normalize.js +24 -6
- package/dist/normalize.js.map +1 -1
- package/package.json +3 -3
package/.turbo/turbo-build.log
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,15 @@
|
|
|
1
1
|
# @terrazzo/cli
|
|
2
2
|
|
|
3
|
+
## 0.2.8
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#380](https://github.com/terrazzoapp/terrazzo/pull/380) [`a18c0a9`](https://github.com/terrazzoapp/terrazzo/commit/a18c0a972b6e6c19f2c0856e10326d96a838fcd2) Thanks [@drwpow](https://github.com/drwpow)! - Fix bug in normalize where modes were skipped over
|
|
8
|
+
|
|
9
|
+
- Updated dependencies [[`a18c0a9`](https://github.com/terrazzoapp/terrazzo/commit/a18c0a972b6e6c19f2c0856e10326d96a838fcd2)]:
|
|
10
|
+
- @terrazzo/parser@0.2.8
|
|
11
|
+
- @terrazzo/token-tools@0.2.8
|
|
12
|
+
|
|
3
13
|
## 0.2.7
|
|
4
14
|
|
|
5
15
|
### Patch Changes
|
package/dist/normalize.js
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import fs from 'node:fs';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { parse as parseJSON, print } from '@humanwhocodes/momoa';
|
|
4
|
-
import { defineConfig, parse, traverse } from '@terrazzo/parser';
|
|
4
|
+
import { defineConfig, getObjMembers, parse, traverse } from '@terrazzo/parser';
|
|
5
|
+
import { isAlias } from '@terrazzo/token-tools';
|
|
5
6
|
import { cwd, printError } from './shared.js';
|
|
6
|
-
function
|
|
7
|
-
return
|
|
7
|
+
function findMember(name) {
|
|
8
|
+
return function (member) {
|
|
9
|
+
return member.name.type === 'String' && member.name.value === name;
|
|
10
|
+
};
|
|
8
11
|
}
|
|
9
12
|
export async function normalizeCmd(filename, { logger, output }) {
|
|
10
13
|
try {
|
|
@@ -28,15 +31,30 @@ export async function normalizeCmd(filename, { logger, output }) {
|
|
|
28
31
|
if (!token || token.aliasOf || node.type !== 'Member' || node.value.type !== 'Object') {
|
|
29
32
|
return;
|
|
30
33
|
}
|
|
31
|
-
const $valueI = node.value.members.findIndex(
|
|
32
|
-
const newValueContainer = parseJSON(JSON.stringify({ $value: token.$value })).body;
|
|
33
|
-
const newValueNode = newValueContainer.members.find(find$value);
|
|
34
|
+
const $valueI = node.value.members.findIndex(findMember('$value'));
|
|
34
35
|
switch (token.$type) {
|
|
35
36
|
case 'color':
|
|
36
37
|
case 'dimension':
|
|
37
38
|
case 'duration': {
|
|
38
39
|
if (node.value.members[$valueI].value.type === 'String') {
|
|
40
|
+
const newValueContainer = parseJSON(JSON.stringify({ $value: token.$value })).body;
|
|
41
|
+
const newValueNode = newValueContainer.members.find(findMember('$value'));
|
|
39
42
|
node.value.members[$valueI] = newValueNode;
|
|
43
|
+
const { $extensions } = getObjMembers(node.value);
|
|
44
|
+
if ($extensions?.type === 'Object') {
|
|
45
|
+
const { mode } = getObjMembers($extensions);
|
|
46
|
+
if (mode?.type === 'Object') {
|
|
47
|
+
for (let i = 0; i < mode.members.length; i++) {
|
|
48
|
+
const modeName = mode.members[i].name.value;
|
|
49
|
+
if (isAlias(token.mode[modeName])) {
|
|
50
|
+
continue;
|
|
51
|
+
}
|
|
52
|
+
const newModeValueContainer = parseJSON(JSON.stringify({ [modeName]: token.mode[modeName].$value })).body;
|
|
53
|
+
const newModeValueNode = newModeValueContainer.members.find(findMember(modeName));
|
|
54
|
+
mode.members[i] = newModeValueNode;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
40
58
|
}
|
|
41
59
|
break;
|
|
42
60
|
}
|
package/dist/normalize.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../src/normalize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,
|
|
1
|
+
{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../src/normalize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAqD,KAAK,IAAI,SAAS,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AACpH,OAAO,EAAe,YAAY,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC7F,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAO9C,SAAS,UAAU,CAAC,IAAY;IAC9B,OAAO,UAAU,MAAkB;QACjC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC;IACrE,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,QAAgB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAoB;IACvF,IAAI,CAAC;QACH,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,0DAA0D,EAAE,CAAC,CAAC;YACtF,OAAO;QACT,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9B,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,iBAAiB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;QACxG,CAAC;QACD,MAAM,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;QACvC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,EAAE;YACzE,MAAM,EAAE,YAAY,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC;YACjC,MAAM;SACP,CAAC,CAAC;QAEH,QAAQ,CAAC,QAAQ,EAAE;YACjB,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ;gBAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBAEzC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACtF,OAAO;gBACT,CAAC;gBACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAEnE,QAAQ,KAAK,CAAC,KAAK,EAAE,CAAC;oBACpB,KAAK,OAAO,CAAC;oBACb,KAAK,WAAW,CAAC;oBACjB,KAAK,UAAU,CAAC,CAAC,CAAC;wBAChB,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAE,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;4BACzD,MAAM,iBAAiB,GAAG,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAkB,CAAC;4BACjG,MAAM,YAAY,GAAG,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAE,CAAC;4BAC3E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC;4BAE3C,MAAM,EAAE,WAAW,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;4BAClD,IAAI,WAAW,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;gCACnC,MAAM,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;gCAC5C,IAAI,IAAI,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;oCAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wCAC7C,MAAM,QAAQ,GAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,IAAmB,CAAC,KAAK,CAAC;wCAC7D,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAE,CAAC,EAAE,CAAC;4CACnC,SAAS;wCACX,CAAC;wCACD,MAAM,qBAAqB,GAAG,SAAS,CACrC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAE,CAAC,MAAM,EAAE,CAAC,CAC7D,CAAC,IAAkB,CAAC;wCACrB,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAE,CAAC;wCACnF,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC;oCACrC,CAAC;gCACH,CAAC;4BACH,CAAC;wBACH,CAAC;wBACD,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC;SACF,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACvC,EAAE,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,EAAE,CAAC,aAAa,CAAC,SAAS,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,UAAU,CAAE,GAAa,CAAC,OAAO,CAAC,CAAC;QACnC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@terrazzo/cli",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.8",
|
|
4
4
|
"description": "CLI for managing design tokens using the Design Tokens Community Group (DTCG) standard and generating code for any platform via plugins.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"author": {
|
|
@@ -51,8 +51,8 @@
|
|
|
51
51
|
"meriyah": "^6.0.3",
|
|
52
52
|
"picocolors": "^1.1.1",
|
|
53
53
|
"yaml-to-momoa": "^0.0.3",
|
|
54
|
-
"@terrazzo/parser": "^0.2.
|
|
55
|
-
"@terrazzo/token-tools": "^0.2.
|
|
54
|
+
"@terrazzo/parser": "^0.2.8",
|
|
55
|
+
"@terrazzo/token-tools": "^0.2.8"
|
|
56
56
|
},
|
|
57
57
|
"scripts": {
|
|
58
58
|
"build": "tsc -p tsconfig.build.json",
|