@supernova-studio/supernova-sdk-beta 1.6.20 → 1.6.22

package/build/sdk-typescript/src/core/data/SDKDataCore.d.ts

@@ -304,4 +304,6 @@ export declare class DataCore {
     getImportJob(designSystemId: string, versionId: string, jobId: string): Promise<ImportJob>;
     getImportJobs(designSystemId: string, versionId: string): Promise<Array<ImportJob>>;
     scheduleImportJobForFigmaSources(designSystemId: string, versionId: string, sourceIds: Array<string>, dryRun: boolean): Promise<ImportJob>;
+    getTokenStudioData(designSystemId: string, versionId: string): Promise<object>;
+    writeTokenStudioData(designSystemId: string, versionId: string, data: object): Promise<boolean>;
 }

package/build/sdk-typescript/src/core/data/requests/SDKDataCoreReadRequests.d.ts

@@ -128,4 +128,5 @@ export declare class DataCoreReadRequests {
     getVersions(designSystemId: string): Promise<Array<DesignSystemVersionRemoteModel>>;
     getImportJobs(designSystemId: string, versionId: string): Promise<Array<ImportJobRemoteModel>>;
     getImportJob(designSystemId: string, versionId: string, jobId: string): Promise<ImportJobRemoteModel>;
+    getTokenStudioData(designSystemId: string, versionId: string): Promise<object>;
 }

package/build/sdk-typescript/src/core/data/requests/SDKDataCoreWriteRequests.d.ts

@@ -124,4 +124,5 @@ export declare class DataCoreWriteRequests {
     linkFigmaSource(designSystemId: string, data: object): Promise<SourceRemoteModel>;
     updateFigmaSource(designSystemId: string, sourceId: string, data: object): Promise<SourceRemoteModel>;
     updateFigmaSourceClaimOwnership(designSystemId: string, sourceId: string): Promise<SourceRemoteModel>;
+    writeTokenStudioJSONData(designSystemId: string, versionId: string, data: object): Promise<boolean>;
 }

package/build/sdk-typescript/src/model/support/SDKTokenOrigin.d.ts

@@ -2,10 +2,14 @@ export type TokenOriginModel = {
     id?: string;
     name?: string;
     sourceId?: string;
+    referenceOriginId?: string;
+    referencePersistentId?: string;
 };
 export declare class TokenOrigin {
     id: string | null;
     name: string | null;
     sourceId: string | null;
+    referenceOriginId?: string | null;
+    referencePersistentId?: string | null;
     constructor(model: TokenOriginModel);
 }

package/build/sdk-typescript/src/model/tokens/SDKTokenValue.d.ts

@@ -198,3 +198,4 @@ export declare const checkSingleReferencedTokenById: (token: AnyToken, candidate
 export declare const replaceReferencedTokenIds: (token: AnyToken, currentId: string, newId: string, allTokens: Map<string, Token>) => void;
 export declare const replaceReferencedToken: (token: Token, existingToken: AnyToken, newToken: AnyToken) => void;
 export declare const replaceReferencedTokenByIds: (token: Token, existingTokenId: string, newTokenId: string) => void;
+export declare const replaceOriginReferencePersistentIdByIds: (token: Token, existingTokenId: string, newTokenId: string) => void;

package/build/sdk-typescript/src/model/tokens/remote/SDKRemoteTokenModel.d.ts

@@ -14,6 +14,8 @@ export type TokenRemoteModel = {
         id?: string;
         name?: string;
         sourceId?: string;
+        referenceOriginId?: string;
+        referencePersistentId?: string;
     };
     data: {
         aliasTo?: string;

package/build/sdk-typescript/src/tests/validators.d.ts

@@ -82,3 +82,4 @@ export declare const validateColorTokenJustOpacityRef: (t: any, tokens: Token[],
 export declare const validateDimensionTokenRef: (t: any, tokens: Token[], description: string, refName: string, measure: number, unit: Unit) => void;
 export declare const validateBorderTokenRef: (t: any, tokens: Token[], description: string, refName: string, hex: string, position: BorderPosition, style: BorderStyle, measure: number, unit: Unit) => void;
 export declare const validateBorderTokenInnerRef: (t: any, tokens: Token[], name: string, hex: string, position: BorderPosition, style: BorderStyle, measure: number, unit: Unit) => void;
+export declare const validateOrigin: (t: any, tokens: Token[], name: string, nameRef: string) => void;

package/build/sdk-typescript/src/tools/design-tokens/utilities/SDKDTJSONConverter.d.ts

@@ -17,6 +17,7 @@ export declare class DTJSONConverter {
     referenceResolver: DTTokenReferenceResolver;
     constructor(versionId: string, mapping: DTPluginToSupernovaMapPack);
     convertNodesToTokens(nodes: Array<DTParsedNode>, brand: Brand): Array<DTProcessedTokenNode>;
+    private remapRootNodeKey;
     private remapRootNodeKeys;
     private convertNodesToTokensForSupportedNodeTypes;
     private convertAtomicNode;

package/build/sdk-typescript/src/tools/design-tokens/utilities/SDKDTTokenReferenceResolver.d.ts

@@ -12,6 +12,7 @@ export declare class DTTokenReferenceResolver {
     unmappedValues(): Array<DTProcessedTokenNode>;
     tokensOfType(type: TokenType): Array<Token>;
     lookupReferencedToken(reference: string): Token | undefined;
+    lookupReferencedNode(reference: string): DTProcessedTokenNode | undefined;
     lookupAllReferencedTokens(reference: string): Array<{
         token: Token;
         key: string;

package/build/sdk-typescript/src/tools/json-builder/elements-transformers/SDKToolsJSONElementTransformer.d.ts

@@ -62,7 +62,7 @@ export declare class TokenJSONElementTransformer {
     safeGroupName(group: TokenGroup): string;
     processedName(name: string, naming: JSONBuilderNamingOption): string;
     /** Retrieve human-readable token type in unified fashion, used both as token type and as token master group */
-    typeLabel(type: TokenType): "color" | "gradient" | "typography" | "border" | "textCase" | "textDecoration" | "shadow" | "visibility" | "text" | "measure";
+    typeLabel(type: TokenType): "color" | "gradient" | "typography" | "border" | "textCase" | "textDecoration" | "shadow" | "visibility" | "measure" | "text";
     /** Retrieve chain of groups up to a specified group, ordered from parent to children */
     referenceGroupChain(containingGroup: TokenGroup, allGroups: Array<TokenGroup>): Array<TokenGroup>;
 }

package/build/supernova-sdk-typescript.js

@@ -36974,21 +36974,14 @@ class AreaVersions {
     }
     getTokenStudioData(from) {
         return __awaiter(this, void 0, void 0, function* () {
-            return {};
-            // return this.dataCore.getTokenStudioData(from.designSystemId, from.versionId)
+            return this.dataCore.getTokenStudioData(from.designSystemId, from.versionId);
         });
     }
     // --- --- --- --- --- --- --- --- --- ---
     // MARK: - Create/Update
     writeTokenStudioData(from, data) {
         return __awaiter(this, void 0, void 0, function* () {
-            return false;
-            /*
-            return this.dataCore.writeTokenStudioData(
-              from.designSystemId,
-              from.versionId,
-              data
-            ) */
+            return this.dataCore.writeTokenStudioData(from.designSystemId, from.versionId, data);
         });
     }
 }
@@ -38654,6 +38647,16 @@ class DataCore {
             return new SDKImportJob_1.ImportJob(data);
         });
     }
+    getTokenStudioData(designSystemId, versionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.read.getTokenStudioData(designSystemId, versionId);
+        });
+    }
+    writeTokenStudioData(designSystemId, versionId, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.write.writeTokenStudioJSONData(designSystemId, versionId, data);
+        });
+    }
 }
 exports.DataCore = DataCore;
 
@@ -39109,6 +39112,13 @@ class DataCoreReadRequests {
             return payload.result.job;
         });
     }
+    getTokenStudioData(designSystemId, versionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = this.bridge.getVersionEndpoint(designSystemId, versionId, "bff/token-studio");
+            const payload = yield this.bridge.get(endpoint);
+            return payload.result;
+        });
+    }
 }
 exports.DataCoreReadRequests = DataCoreReadRequests;
 
@@ -39836,6 +39846,13 @@ class DataCoreWriteRequests {
             return payload.result.source;
         });
     }
+    writeTokenStudioJSONData(designSystemId, versionId, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = this.bridge.getVersionEndpoint(designSystemId, versionId, "bff/token-studio");
+            yield this.bridge.post(endpoint, data);
+            return true;
+        });
+    }
 }
 exports.DataCoreWriteRequests = DataCoreWriteRequests;
 
@@ -47041,10 +47058,12 @@ class TokenOrigin {
     // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
     // MARK: - Constructor
     constructor(model) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         this.id = (_a = model.id) !== null && _a !== void 0 ? _a : null;
         this.name = (_b = model.name) !== null && _b !== void 0 ? _b : null;
         this.sourceId = (_c = model.sourceId) !== null && _c !== void 0 ? _c : null;
+        this.referenceOriginId = (_d = model.referenceOriginId) !== null && _d !== void 0 ? _d : null;
+        this.referencePersistentId = (_e = model.referencePersistentId) !== null && _e !== void 0 ? _e : null;
     }
 }
 exports.TokenOrigin = TokenOrigin;
@@ -47384,7 +47403,7 @@ class TokenTheme {
         return this.overriddenTokens.map(o => this.toWriteOverrideObject(o));
     }
     toWriteOverrideObject(token) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const model = {
             data: this.valueToWriteObject(token.value, token.tokenType, token),
             tokenPersistentId: token.id,
@@ -47394,6 +47413,8 @@ class TokenTheme {
                     id: (_a = token.origin.id) !== null && _a !== void 0 ? _a : undefined,
                     name: (_b = token.origin.name) !== null && _b !== void 0 ? _b : undefined,
                     sourceId: (_c = token.origin.sourceId) !== null && _c !== void 0 ? _c : undefined,
+                    referenceOriginId: (_d = token.origin.referenceOriginId) !== null && _d !== void 0 ? _d : undefined,
+                    referencePersistentId: (_e = token.origin.referencePersistentId) !== null && _e !== void 0 ? _e : undefined,
                 }
                 : undefined,
             createdAt: token.createdAt ? token.createdAt.toISOString() : undefined,
@@ -47514,7 +47535,7 @@ class TokenThemeOverride {
     // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
     // MARK: - Manipulation
     toWriteObject() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         return {
             data: this.valueToWriteObject(this.value, this.type),
             tokenPersistentId: this.tokenId,
@@ -47524,6 +47545,8 @@ class TokenThemeOverride {
                     id: (_a = this.origin.id) !== null && _a !== void 0 ? _a : undefined,
                     name: (_b = this.origin.name) !== null && _b !== void 0 ? _b : undefined,
                     sourceId: (_c = this.origin.sourceId) !== null && _c !== void 0 ? _c : undefined,
+                    referenceOriginId: (_d = this.origin.referenceOriginId) !== null && _d !== void 0 ? _d : undefined,
+                    referencePersistentId: (_e = this.origin.referencePersistentId) !== null && _e !== void 0 ? _e : undefined,
                 }
                 : undefined,
             createdAt: this.createdAt ? this.createdAt.toISOString() : undefined,
@@ -48241,6 +48264,7 @@ class DimensionCategoryToken extends SDKToken_1.Token {
     // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
     // MARK: - Static building
     static create(type, versionId, brandId, name, description, value, alias, properties, propertyValues) {
+        var _a;
         const baseToken = {
             id: undefined,
             persistentId: (0, uuid_1.v4)(),
@@ -48276,7 +48300,9 @@ class DimensionCategoryToken extends SDKToken_1.Token {
                     measure: DimensionCategoryToken.getCompatibleMeasure(alias.value.unit, type, alias.value.measure),
                     referencedTokenId: null
                 };
-                return new this(versionId, baseToken, tokenValue, undefined, properties, propertyValues);
+                const result = new this(versionId, baseToken, tokenValue, undefined, properties, propertyValues);
+                result.origin = Object.assign(Object.assign({}, ((_a = result.origin) !== null && _a !== void 0 ? _a : { id: null, name: null, sourceId: null })), { referencePersistentId: alias.id });
+                return result;
             }
         }
         throw SDKSupernovaError_1.SupernovaError.fromMessage("Dimension Token must be created using value or alias, but none was provided");
@@ -48450,6 +48476,7 @@ class DimensionCategoryToken extends SDKToken_1.Token {
                     };
                 }
                 else {
+                    // 
                     // If tokenType from args !== tokenType resolved, inline
                     // Align units, if we reference dimension from Opacity, unit must become raw
                     console.log(`Inlining reference ${reference.id}: ${reference.tokenType} into ${definition}:${tokenType}`);
@@ -49672,7 +49699,7 @@ class Token {
         this.sortOrder = order;
     }
     toBaseWriteObject() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         return {
             id: this.idInVersion,
             brandId: this.brandId,
@@ -49688,6 +49715,8 @@ class Token {
                     id: (_b = this.origin.id) !== null && _b !== void 0 ? _b : undefined,
                     name: (_c = this.origin.name) !== null && _c !== void 0 ? _c : undefined,
                     sourceId: (_d = this.origin.sourceId) !== null && _d !== void 0 ? _d : undefined,
+                    referenceOriginId: (_e = this.origin.referenceOriginId) !== null && _e !== void 0 ? _e : undefined,
+                    referencePersistentId: (_f = this.origin.referencePersistentId) !== null && _f !== void 0 ? _f : undefined,
                 }
                 : undefined,
             customPropertyOverrides: [],
@@ -49944,7 +49973,7 @@ exports.TokenComparator = TokenComparator;
 //  This file defines all token value containers for the actual  model - this model will be exactly available to users
 //
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.replaceReferencedTokenByIds = exports.replaceReferencedToken = exports.replaceReferencedTokenIds = exports.checkSingleReferencedTokenById = exports.getSingleReferencedTokenId = exports.getReferencedTokens = void 0;
+exports.replaceOriginReferencePersistentIdByIds = exports.replaceReferencedTokenByIds = exports.replaceReferencedToken = exports.replaceReferencedTokenIds = exports.checkSingleReferencedTokenById = exports.getSingleReferencedTokenId = exports.getReferencedTokens = void 0;
 const SDKGradientToken_1 = __webpack_require__(/*! ./SDKGradientToken */ "./src/model/tokens/SDKGradientToken.ts");
 const SDKShadowToken_1 = __webpack_require__(/*! ./SDKShadowToken */ "./src/model/tokens/SDKShadowToken.ts");
 const getReferencedTokens = (token, allTokens) => {
@@ -49979,6 +50008,7 @@ const replaceReferencedTokenIds = (token, currentId, newId, allTokens) => {
 exports.replaceReferencedTokenIds = replaceReferencedTokenIds;
 const replaceReferencedToken = (token, existingToken, newToken) => {
     (0, exports.replaceReferencedTokenByIds)(token, existingToken.id, newToken.id);
+    (0, exports.replaceOriginReferencePersistentIdByIds)(token, existingToken.id, newToken.id);
 };
 exports.replaceReferencedToken = replaceReferencedToken;
 const replaceReferencedTokenByIds = (token, existingTokenId, newTokenId) => {
@@ -50001,6 +50031,18 @@ const replaceReferencedTokenByIds = (token, existingTokenId, newTokenId) => {
     }
 };
 exports.replaceReferencedTokenByIds = replaceReferencedTokenByIds;
+const replaceOriginReferencePersistentIdByIds = (token, existingTokenId, newTokenId) => {
+    const origin = token === null || token === void 0 ? void 0 : token.origin;
+    if (!(origin === null || origin === void 0 ? void 0 : origin.referencePersistentId)) {
+        // Do nothing if there is no origin
+    }
+    else if (origin.referencePersistentId && !Array.isArray(origin.referencePersistentId)) {
+        if (origin.referencePersistentId === existingTokenId) {
+            origin.referencePersistentId = newTokenId;
+        }
+    }
+};
+exports.replaceOriginReferencePersistentIdByIds = replaceOriginReferencePersistentIdByIds;
 
 
 /***/ }),
@@ -51305,17 +51347,13 @@ class SupernovaToolsDesignTokensPlugin {
         return mapping;
     }
     setTokensOrigin(map, brand, sources) {
-        var _a;
+        var _a, _b, _c;
         const sourceId = (_a = sources.find((s) => s.type === SDKSourceType_1.SourceType.tokenStudio && s.brandId === brand.id)) === null || _a === void 0 ? void 0 : _a.id;
         if (!sourceId) {
             return map;
         }
         for (const node of map.processedNodes) {
-            node.token.origin = {
-                name: node.token.name,
-                sourceId,
-                id: node.key,
-            };
+            node.token.origin = Object.assign(Object.assign({ name: node.token.name, sourceId, id: node.key }, (((_b = node.token.origin) === null || _b === void 0 ? void 0 : _b.referenceOriginId) ? { referenceOriginId: node.token.origin.referenceOriginId } : {})), (((_c = node.token.origin) === null || _c === void 0 ? void 0 : _c.referencePersistentId) ? { referencePersistentId: node.token.origin.referencePersistentId } : {}));
         }
         return map;
     }
@@ -51599,112 +51637,117 @@ class DTJSONConverter {
         // Retrieve all tokens
         return processedNodes;
     }
+    remapRootNodeKey(nodePath, tokenType, nodeOriginalType, nodeTokenName) {
+        let path = Array.from(nodePath);
+        let firstSegment = path.splice(0, 1)[0];
+        // Remap remote to proper destination
+        // TODO: maybe we should make firstSegment typed?
+        const type = tokenType;
+        switch (type) {
+            case SDKTokenType_1.TokenType.color:
+                firstSegment = "Color";
+                break;
+            case SDKTokenType_1.TokenType.gradient:
+                firstSegment = "Gradient";
+                break;
+            // TEST: Do we use separate keys for all Dimensions
+            case SDKTokenType_1.TokenType.radius:
+                firstSegment = "Radius";
+                break;
+            case SDKTokenType_1.TokenType.space:
+            case SDKTokenType_1.TokenType.opacity:
+            case SDKTokenType_1.TokenType.fontSize:
+            case SDKTokenType_1.TokenType.lineHeight:
+            case SDKTokenType_1.TokenType.letterSpacing:
+            case SDKTokenType_1.TokenType.paragraphSpacing:
+            case SDKTokenType_1.TokenType.borderWidth:
+            case SDKTokenType_1.TokenType.duration:
+            case SDKTokenType_1.TokenType.zIndex:
+            case SDKTokenType_1.TokenType.size:
+            case SDKTokenType_1.TokenType.dimension:
+                // firstSegment = "Dimension"
+                firstSegment = "Measure";
+                break;
+            case SDKTokenType_1.TokenType.shadow:
+                firstSegment = "Shadow";
+                break;
+            case SDKTokenType_1.TokenType.typography:
+                firstSegment = "Typography";
+                break;
+            // TEST: Should we now use separate segments here or String?
+            case SDKTokenType_1.TokenType.fontFamily:
+            case SDKTokenType_1.TokenType.fontWeight:
+                firstSegment = "Generic";
+                break;
+            case SDKTokenType_1.TokenType.border:
+                firstSegment = "Border";
+                break;
+            case SDKTokenType_1.TokenType.textCase:
+            case SDKTokenType_1.TokenType.textDecoration:
+            case SDKTokenType_1.TokenType.visibility:
+                firstSegment = "Options";
+                break;
+            default:
+                throw new UnreachableCaseError_1.UnreachableCaseError(type, `Unsupported type ${firstSegment} in remapping of nodes`);
+        }
+        let secondSegment;
+        switch (nodeOriginalType) {
+            case "borderRadius":
+                secondSegment = "Border Radius";
+                break;
+            case "borderWidth":
+                secondSegment = "Border Width";
+                break;
+            case "sizing":
+                secondSegment = "Sizing";
+                break;
+            case "fontSizes":
+                secondSegment = "Font Size";
+                break;
+            case "paragraphSpacing":
+                secondSegment = "Paragraph Spacing";
+                break;
+            case "lineHeights":
+                secondSegment = "Line Height";
+                break;
+            case "letterSpacing":
+                secondSegment = "Letter Spacing";
+                break;
+            case "spacing":
+                secondSegment = "Spacing";
+                break;
+            case "opacity":
+                secondSegment = "Opacity";
+                break;
+            case "dimension":
+                secondSegment = "Dimension";
+                break;
+            case 'fontFamilies':
+                secondSegment = 'Font Family';
+                break;
+            case 'fontWeights':
+                secondSegment = 'Font Weight';
+                break;
+            default:
+                // Other types than listed should be ignored
+                break;
+        }
+        // Remap original type and add extra group, if needed
+        if (secondSegment) {
+            path = [firstSegment, secondSegment, ...path];
+        }
+        else {
+            path = [firstSegment, ...path];
+        }
+        // Rebuild key
+        const key = SDKDTTokenMerger_1.DTTokenMerger.buildKey(path, nodeTokenName);
+        return { path, key };
+    }
     remapRootNodeKeys(nodes) {
         for (const node of nodes) {
-            let path = Array.from(node.path);
-            let firstSegment = path.splice(0, 1)[0];
-            // Remap remote to proper destination
-            // TODO: maybe we should make firstSegment typed?
-            const type = node.token.tokenType;
-            switch (type) {
-                case SDKTokenType_1.TokenType.color:
-                    firstSegment = "Color";
-                    break;
-                case SDKTokenType_1.TokenType.gradient:
-                    firstSegment = "Gradient";
-                    break;
-                // TEST: Do we use separate keys for all Dimensions
-                case SDKTokenType_1.TokenType.radius:
-                    firstSegment = "Radius";
-                    break;
-                case SDKTokenType_1.TokenType.space:
-                case SDKTokenType_1.TokenType.opacity:
-                case SDKTokenType_1.TokenType.fontSize:
-                case SDKTokenType_1.TokenType.lineHeight:
-                case SDKTokenType_1.TokenType.letterSpacing:
-                case SDKTokenType_1.TokenType.paragraphSpacing:
-                case SDKTokenType_1.TokenType.borderWidth:
-                case SDKTokenType_1.TokenType.duration:
-                case SDKTokenType_1.TokenType.zIndex:
-                case SDKTokenType_1.TokenType.size:
-                case SDKTokenType_1.TokenType.dimension:
-                    // firstSegment = "Dimension"
-                    firstSegment = "Measure";
-                    break;
-                case SDKTokenType_1.TokenType.shadow:
-                    firstSegment = "Shadow";
-                    break;
-                case SDKTokenType_1.TokenType.typography:
-                    firstSegment = "Typography";
-                    break;
-                // TEST: Should we now use separate segments here or String?
-                case SDKTokenType_1.TokenType.fontFamily:
-                case SDKTokenType_1.TokenType.fontWeight:
-                    firstSegment = "Generic";
-                    break;
-                case SDKTokenType_1.TokenType.border:
-                    firstSegment = "Border";
-                    break;
-                case SDKTokenType_1.TokenType.textCase:
-                case SDKTokenType_1.TokenType.textDecoration:
-                case SDKTokenType_1.TokenType.visibility:
-                    firstSegment = "Options";
-                    break;
-                default:
-                    throw new UnreachableCaseError_1.UnreachableCaseError(type, `Unsupported type ${firstSegment} in remapping of nodes`);
-            }
-            let secondSegment;
-            switch (node.originalType) {
-                case "borderRadius":
-                    secondSegment = "Border Radius";
-                    break;
-                case "borderWidth":
-                    secondSegment = "Border Width";
-                    break;
-                case "sizing":
-                    secondSegment = "Sizing";
-                    break;
-                case "fontSizes":
-                    secondSegment = "Font Size";
-                    break;
-                case "paragraphSpacing":
-                    secondSegment = "Paragraph Spacing";
-                    break;
-                case "lineHeights":
-                    secondSegment = "Line Height";
-                    break;
-                case "letterSpacing":
-                    secondSegment = "Letter Spacing";
-                    break;
-                case "spacing":
-                    secondSegment = "Spacing";
-                    break;
-                case "opacity":
-                    secondSegment = "Opacity";
-                    break;
-                case "dimension":
-                    secondSegment = "Dimension";
-                    break;
-                case 'fontFamilies':
-                    secondSegment = 'Font Family';
-                    break;
-                case 'fontWeights':
-                    secondSegment = 'Font Weight';
-                    break;
-                default:
-                    // Other types than listed should be ignored
-                    break;
-            }
-            // Remap original type and add extra group, if needed
-            if (secondSegment) {
-                path = [firstSegment, secondSegment, ...path];
-            }
-            else {
-                path = [firstSegment, ...path];
-            }
+            let { path, key } = this.remapRootNodeKey(node.path, node.token.tokenType, node.originalType, node.token.name);
             node.path = path;
-            // Rebuild key
-            node.key = SDKDTTokenMerger_1.DTTokenMerger.buildKey(node.path, node.token.name);
+            node.key = key;
         }
         return nodes;
     }
@@ -51910,6 +51953,7 @@ class DTJSONConverter {
     }
     // TODO: Can we do better or need to copy paste?
     convertPureReferencedNode(node, brand) {
+        var _a, _b;
         const valueAsReference = node.value;
         const resolvedToken = this.referenceResolver.lookupReferencedToken(valueAsReference);
         if (resolvedToken) {
@@ -51932,6 +51976,12 @@ class DTJSONConverter {
                 case SDKTokenType_1.TokenType.duration:
                 case SDKTokenType_1.TokenType.zIndex:
                     constructedToken = (0, SDKDimensionToken_1.resolveDimension)(snType).create(snType, this.versionId, brand.id, node.name, node.description, undefined, resolvedToken, [], []);
+                    if (resolvedToken && ((_a = constructedToken.origin) === null || _a === void 0 ? void 0 : _a.referencePersistentId)) {
+                        const refNode = this.referenceResolver.lookupReferencedNode(valueAsReference);
+                        const key = this.remapRootNodeKey(refNode.path, resolvedToken.tokenType, refNode.originalType, resolvedToken.name).key;
+                        console.log(`Inlining reference origin id ${valueAsReference}: ${key}: ${(_b = constructedToken.origin) === null || _b === void 0 ? void 0 : _b.referencePersistentId} into ${constructedToken.id}:${node.name}:${node.type}`);
+                        constructedToken.origin.referenceOriginId = key;
+                    }
                     break;
                 case SDKTokenType_1.TokenType.shadow:
                     constructedToken = SDKShadowToken_1.ShadowToken.create(this.versionId, brand.id, node.name, node.description, undefined, resolvedToken, this.referenceResolver, [], []);
@@ -52623,6 +52673,8 @@ class DTThemeMerger {
             const tokensToIterate = [...themeReplica.overriddenTokens, ...[...tokensInThemeButNotInUpstream.values()].map(t => t.token)];
             for (const node of tokensToIterate) {
                 (0, SDKTokenValue_1.replaceReferencedTokenByIds)(node, oldId, newId);
+                (0, SDKTokenValue_1.replaceOriginReferencePersistentIdByIds)(node, oldId, newId);
+                // TODO: Fix inside Typography.fontSize
                 TokenUtils_1.TokenUtils.replaceIdForComplexTokens(node, oldId, newId);
             }
         }
@@ -52869,6 +52921,8 @@ class DTTokenMerger {
         for (const [oldId, newId] of idsToRemap) {
             for (const node of toCreateOrUpdate) {
                 (0, SDKTokenValue_1.replaceReferencedTokenByIds)(node.token, oldId, newId);
+                (0, SDKTokenValue_1.replaceOriginReferencePersistentIdByIds)(node.token, oldId, newId);
+                // TODO: Fix inside Typography.fontSize
                 TokenUtils_1.TokenUtils.replaceIdForComplexTokens(node.token, oldId, newId);
             }
         }
@@ -53020,6 +53074,16 @@ class DTTokenReferenceResolver {
         // Find single token reference
         return (_a = this.mappedTokens.get(ref)) === null || _a === void 0 ? void 0 : _a[0];
     }
+    lookupReferencedNode(reference) {
+        reference = reference.trim();
+        let ref = reference;
+        if (reference.includes('$')) {
+            // Convert $ reference to {}-type of reference as keys are all defined as {}
+            ref = `{${reference.substring(1)}}`;
+        }
+        // Find single token reference
+        return this.nodes.get(ref);
+    }
     lookupAllReferencedTokens(reference) {
         var _a, _b;
         reference = reference.trim();