fix: dtcg option not passed in some places (#1116)

.changeset/happy-vans-end.md

@@ -0,0 +1,5 @@
+---
+'style-dictionary': patch
+---
+
+Fix a couple of spots where DTCG option wasn't properly taken into account, more tests added.

__tests__/exportPlatform.test.js

@@ -461,6 +461,10 @@ describe('exportPlatform', () => {
               },
             },
           },
+          reftest: { $value: '{zero.$value}' },
+          zero: { $value: '0' },
+          reftest2: { $value: '{one}' },
+          one: { $value: '1' },
         },
         transform: {
           'custom/add/px': {
@@ -493,6 +497,9 @@ describe('exportPlatform', () => {
 
       // considers "value" a token group here
       expect(tokens.dimensions.nested.value.deep.$value).to.equal('30px');
+
+      expect(tokens.reftest.$value).to.equal('0px');
+      expect(tokens.reftest2.$value).to.equal('1px');
     });
   });
 });

__tests__/utils/resolveObject.test.js

@@ -336,5 +336,19 @@ describe('utils', () => {
       expect(GroupMessages.fetchMessages(PROPERTY_REFERENCE_WARNINGS).length).to.equal(0);
       expect(test.test.value).to.equal(0);
     });
+
+    it('should support DTCG format', () => {
+      const test = resolveObject(
+        {
+          test: { $value: '{zero.$value}' },
+          zero: { $value: 0 },
+          test2: { $value: '{one}' },
+          one: { $value: 1 },
+        },
+        { usesDtcg: true },
+      );
+      expect(test.test.$value).to.equal(0);
+      expect(test.test2.$value).to.equal(1);
+    });
   });
 });

lib/StyleDictionary.js

@@ -341,9 +341,12 @@ export default class StyleDictionary extends Register {
       );
 
       // referenced values, that have not (yet) been transformed should be excluded from resolving
-      const ignorePathsToResolve = deferredPropValueTransforms.map((p) => getName([p, 'value']));
+      const ignorePathsToResolve = deferredPropValueTransforms.map((p) =>
+        getName([p, this.options.usesDtcg ? '$value' : 'value']),
+      );
       exportableResult = resolveObject(transformed, {
         ignorePaths: ignorePathsToResolve,
+        usesDtcg: this.options.usesDtcg,
       });
 
       const newDeferredPropCount = deferredPropValueTransforms.length;
@@ -357,7 +360,9 @@ export default class StyleDictionary extends Register {
         // if we didn't resolve any deferred references then we have a circular reference
         // the resolveObject method will find the circular references
         // we do this in case there are multiple circular references
-        resolveObject(transformed);
+        resolveObject(transformed, {
+          usesDtcg: this.options.usesDtcg,
+        });
         finished = true;
       } else {
         // neither of these things, keep going.

lib/transform/token.js

@@ -54,7 +54,13 @@ export default async function transformToken(token, config, options) {
       ) {
         // Only transform non-referenced values (from original)
         // and transitive transforms if the value has been resolved
-        if (!usesReferences(token.original.value, config) || transform.transitive) {
+        if (
+          !usesReferences(
+            options.usesDtcg ? token.original.$value : token.original.value,
+            config,
+          ) ||
+          transform.transitive
+        ) {
           const transformedValue = await transform.transformer(to_ret, config, options);
           if (transformedValue === undefined) {
             return undefined;

lib/utils/resolveObject.js

@@ -17,7 +17,7 @@ import { _resolveReferences } from './references/resolveReferences.js';
  * @typedef {import('../../types/DesignToken.d.ts').TransformedTokens} TransformedTokens
  * @typedef {import('../../types/DesignToken.d.ts').TransformedToken} TransformedToken
  * @typedef {import('../../types/Config.d.ts').RegexOptions} RegexOptions
- * @typedef {RegexOptions & {ignorePaths?: string[]; ignoreKeys?: string[]}} Options
+ * @typedef {RegexOptions & {ignorePaths?: string[]; ignoreKeys?: string[]; usesDtcg?: boolean }} Options
  */
 
 const defaults = {