@terrazzo/cli 2.0.3 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @terrazzo/cli
 
+## 2.1.0
+
+### Minor Changes
+
+- [#740](https://github.com/terrazzoapp/terrazzo/pull/740) [`2845b02`](https://github.com/terrazzoapp/terrazzo/commit/2845b02718db1ddbf5e17efdc53ff16109b63d28) Thanks [@badams](https://github.com/badams)! - Add OAuth bearer token support for Figma import. Set `FIGMA_OAUTH_TOKEN` to use an OAuth access token instead of a Personal Access Token (`FIGMA_ACCESS_TOKEN`). OAuth takes precedence if both are set.
+
+### Patch Changes
+
+- [#742](https://github.com/terrazzoapp/terrazzo/pull/742) [`de25711`](https://github.com/terrazzoapp/terrazzo/commit/de25711f65c10c58776f7b71c5621f6228387f79) Thanks [@mrginglymus](https://github.com/mrginglymus)! - Respect --no-lint options in build command
+
+- [#715](https://github.com/terrazzoapp/terrazzo/pull/715) [`6261145`](https://github.com/terrazzoapp/terrazzo/commit/62611450071c4c1e09a1ffd78998cbfdc36605ba) Thanks [@heddendorp](https://github.com/heddendorp)! - Fix Figma alias resolution for hidden local variables
+
+- Updated dependencies [[`fefd4b1`](https://github.com/terrazzoapp/terrazzo/commit/fefd4b149d03ca2199eaddc7b197e4e081169e7f)]:
+  - @terrazzo/token-tools@2.1.0
+
 ## 2.0.3
 
 ### Patch Changes

package/bin/cli.js

@@ -65,6 +65,7 @@ const { values: flags, positionals } = parseArgs({
     watch: { type: 'boolean', short: 'w' },
     version: { type: 'boolean' },
     unpublished: { type: 'boolean' },
+    'no-lint': { type: 'boolean' },
     'skip-styles': { type: 'boolean' },
     'skip-variables': { type: 'boolean' },
     'font-family-names': { type: 'string' },

package/dist/index.d.ts

@@ -13,6 +13,8 @@ interface Flags {
   out?: string;
   /** --help */
   help?: boolean;
+  /** --no-lint */
+  'no-lint'?: boolean;
   /** --watch, -w */
   watch?: boolean;
   /** --version */

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/shared.ts","../src/build.ts","../src/check.ts","../src/format.ts","../src/help.ts","../src/import/figma/index.ts","../src/import/index.ts","../src/init.ts","../src/lab.ts","../src/version.ts","../src/index.ts"],"mappings":"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"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/shared.ts","../src/build.ts","../src/check.ts","../src/format.ts","../src/help.ts","../src/import/figma/index.ts","../src/import/index.ts","../src/init.ts","../src/lab.ts","../src/version.ts","../src/index.ts"],"mappings":"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"}

package/dist/index.js

@@ -7,6 +7,7 @@ import pc from "picocolors";
 import { createServer } from "vite";
 import { ViteNodeRunner } from "vite-node/client";
 import { ViteNodeServer } from "vite-node/server";
+import { camelCase } from "scule";
 import chokidar from "chokidar";
 import yamlToMomoa from "yaml-to-momoa";
 import * as momoa from "@humanwhocodes/momoa";
@@ -15,7 +16,6 @@ import { isAlias, pluralize } from "@terrazzo/token-tools";
 import yaml from "yaml";
 import fs from "node:fs/promises";
 import { merge } from "merge-anything";
-import { camelCase } from "scule";
 import { spawn } from "node:child_process";
 import { confirm, intro, multiselect, outro, select, spinner } from "@clack/prompts";
 import { detect } from "detect-package-manager";
@@ -24,7 +24,107 @@ import { parseModule } from "meriyah";
 import { Readable, Writable } from "node:stream";
 import { serve } from "@hono/node-server";
 import mime from "mime";
-
+//#region src/import/figma/lib.ts
+const KEY = ":key";
+const FILE_KEY = ":file_key";
+const API = {
+	file: `https://api.figma.com/v1/files/${FILE_KEY}`,
+	fileNodes: `https://api.figma.com/v1/files/${FILE_KEY}/nodes`,
+	fileStyles: `https://api.figma.com/v1/files/${FILE_KEY}/styles`,
+	localVariables: `https://api.figma.com/v1/files/${FILE_KEY}/variables/local`,
+	publishedVariables: `https://api.figma.com/v1/files/${FILE_KEY}/variables/published`,
+	styles: `https://api.figma.com/v1/styles/${KEY}`
+};
+/** Wrapper around camelCase to handle more cases */
+function formatName(name) {
+	return camelCase(name.replace(/\s+/g, "-"));
+}
+const nf = new Intl.NumberFormat("en-us");
+/** Wrapper around camelCase to handle more cases */
+function formatNumber(number) {
+	return nf.format(number);
+}
+/** Get File ID from design URL */
+function getFileID(url) {
+	return url.match(/^https:\/\/(www\.)?figma\.com\/design\/([^/]+)/)?.[2];
+}
+/**
+* Returns Figma API auth headers based on environment variables.
+* Prefers OAuth (FIGMA_OAUTH_TOKEN) over PAT (FIGMA_ACCESS_TOKEN) if both are set.
+* Warns via logger and returns empty headers if neither is set.
+*/
+function getFigmaAuthHeaders(logger) {
+	if (process.env.FIGMA_OAUTH_TOKEN) return { Authorization: `Bearer ${process.env.FIGMA_OAUTH_TOKEN}` };
+	if (process.env.FIGMA_ACCESS_TOKEN) return { "X-Figma-Token": process.env.FIGMA_ACCESS_TOKEN };
+	logger.warn({
+		group: "config",
+		message: "Figma auth not configured! Set FIGMA_OAUTH_TOKEN or FIGMA_ACCESS_TOKEN"
+	});
+	return {};
+}
+/** /v1/files/:file_key */
+async function getFile(fileKey, { logger }) {
+	const res = await fetch(API.file.replace(FILE_KEY, fileKey), {
+		method: "GET",
+		headers: getFigmaAuthHeaders(logger)
+	});
+	if (!res.ok) logger.error({
+		group: "import",
+		message: `${res.status} ${await res.text()}`
+	});
+	return await res.json();
+}
+/** /v1/files/:file_key/nodes */
+async function getFileNodes(fileKey, { ids, logger }) {
+	let url = API.fileNodes.replace(FILE_KEY, fileKey);
+	if (ids?.length) url += `?ids=${ids.join(",")}`;
+	const res = await fetch(url, {
+		method: "GET",
+		headers: getFigmaAuthHeaders(logger)
+	});
+	if (!res.ok) logger.error({
+		group: "import",
+		message: `${res.status} ${await res.text()}`
+	});
+	return await res.json();
+}
+/** /v1/files/:file_key/styles */
+async function getFileStyles(fileKey, { logger }) {
+	const res = await fetch(API.fileStyles.replace(FILE_KEY, fileKey), {
+		method: "GET",
+		headers: getFigmaAuthHeaders(logger)
+	});
+	if (!res.ok) logger.error({
+		group: "import",
+		message: `${res.status} ${await res.text()}`
+	});
+	return await res.json();
+}
+/** /v1/files/:file_key/variables/local */
+async function getFileLocalVariables(fileKey, { logger }) {
+	const res = await fetch(API.localVariables.replace(FILE_KEY, fileKey), {
+		method: "GET",
+		headers: getFigmaAuthHeaders(logger)
+	});
+	if (!res.ok) logger.error({
+		group: "import",
+		message: `${res.status} ${await res.text}`
+	});
+	return await res.json();
+}
+/** /v1/files/:file_key/variables/published */
+async function getFilePublishedVariables(fileKey, { logger }) {
+	const res = await fetch(API.publishedVariables.replace(FILE_KEY, fileKey), {
+		method: "GET",
+		headers: getFigmaAuthHeaders(logger)
+	});
+	if (!res.ok) logger.error({
+		group: "import",
+		message: `${res.status} ${await res.text}`
+	});
+	return await res.json();
+}
+//#endregion
 //#region src/shared.ts
 const cwd = new URL(`${pathToFileURL(process.cwd())}/`);
 const DEFAULT_CONFIG_PATH = new URL("./terrazzo.config.ts", cwd);
@@ -86,6 +186,7 @@ async function loadConfig({ cmd, flags, logger }) {
 				cwd,
 				logger
 			});
+			if (flags["no-lint"]) config.lint.build.enabled = false;
 		} catch (err) {
 			logger.error({
 				group: "config",
@@ -146,12 +247,8 @@ async function loadTokens(tokenPaths, { logger }) {
 					});
 					const headers = new Headers({
 						Accept: "*/*",
-						"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:123.0) Gecko/20100101 Firefox/123.0"
-					});
-					if (process.env.FIGMA_ACCESS_TOKEN) headers.set("X-FIGMA-TOKEN", process.env.FIGMA_ACCESS_TOKEN);
-					else logger.warn({
-						group: "config",
-						message: "FIGMA_ACCESS_TOKEN not set"
+						"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:123.0) Gecko/20100101 Firefox/123.0",
+						...getFigmaAuthHeaders(logger)
 					});
 					const res = await fetch(`https://api.figma.com/v1/files/${fileKey}/variables/local`, {
 						method: "GET",
@@ -245,7 +342,6 @@ function time(start) {
 	const diff = performance.now() - start;
 	return pc.dim(diff < 750 ? `${Math.round(diff)}ms` : `${(diff / 1e3).toFixed(1)}s`);
 }
-
 //#endregion
 //#region src/build.ts
 /** tz build */
@@ -264,9 +360,11 @@ async function buildCmd({ config, configPath, flags, logger }) {
 			});
 			return;
 		}
+		const skipLint = !config.lint.build.enabled;
 		let { tokens, resolver, sources } = await parse(rawSchemas, {
 			config,
 			logger,
+			skipLint,
 			yamlToMomoa
 		});
 		let result = await build(tokens, {
@@ -296,6 +394,7 @@ async function buildCmd({ config, configPath, flags, logger }) {
 					const parseResult = await parse(rawSchemas, {
 						config,
 						logger,
+						skipLint,
 						yamlToMomoa
 					});
 					tokens = parseResult.tokens;
@@ -346,7 +445,6 @@ function writeFiles(result, { config, logger }) {
 		});
 	}
 }
-
 //#endregion
 //#region src/check.ts
 /** tz check */
@@ -373,7 +471,6 @@ async function checkCmd({ config, logger, positionals }) {
 		process.exit(1);
 	}
 }
-
 //#endregion
 //#region src/format.ts
 function findMember(name) {
@@ -492,7 +589,6 @@ function formatTypography(node) {
 	if (!lineHeight) node.members.push(momoa.parse("{\"lineHeight\":1}").body.members[0]);
 	return node;
 }
-
 //#endregion
 //#region src/help.ts
 /** Show help */
@@ -522,95 +618,6 @@ function helpCmd() {
     --quiet          Suppress warnings
 `);
 }
-
-//#endregion
-//#region src/import/figma/lib.ts
-const KEY = ":key";
-const FILE_KEY = ":file_key";
-const API = {
-	file: `https://api.figma.com/v1/files/${FILE_KEY}`,
-	fileNodes: `https://api.figma.com/v1/files/${FILE_KEY}/nodes`,
-	fileStyles: `https://api.figma.com/v1/files/${FILE_KEY}/styles`,
-	localVariables: `https://api.figma.com/v1/files/${FILE_KEY}/variables/local`,
-	publishedVariables: `https://api.figma.com/v1/files/${FILE_KEY}/variables/published`,
-	styles: `https://api.figma.com/v1/styles/${KEY}`
-};
-/** Wrapper around camelCase to handle more cases */
-function formatName(name) {
-	return camelCase(name.replace(/\s+/g, "-"));
-}
-const nf = new Intl.NumberFormat("en-us");
-/** Wrapper around camelCase to handle more cases */
-function formatNumber(number) {
-	return nf.format(number);
-}
-/** Get File ID from design URL */
-function getFileID(url) {
-	return url.match(/^https:\/\/(www\.)?figma\.com\/design\/([^/]+)/)?.[2];
-}
-/** /v1/files/:file_key */
-async function getFile(fileKey, { logger }) {
-	const res = await fetch(API.file.replace(FILE_KEY, fileKey), {
-		method: "GET",
-		headers: { "X-Figma-Token": process.env.FIGMA_ACCESS_TOKEN }
-	});
-	if (!res.ok) logger.error({
-		group: "import",
-		message: `${res.status} ${await res.text()}`
-	});
-	return await res.json();
-}
-/** /v1/files/:file_key/nodes */
-async function getFileNodes(fileKey, { ids, logger }) {
-	let url = API.fileNodes.replace(FILE_KEY, fileKey);
-	if (ids?.length) url += `?ids=${ids.join(",")}`;
-	const res = await fetch(url, {
-		method: "GET",
-		headers: { "X-Figma-Token": process.env.FIGMA_ACCESS_TOKEN }
-	});
-	if (!res.ok) logger.error({
-		group: "import",
-		message: `${res.status} ${await res.text()}`
-	});
-	return await res.json();
-}
-/** /v1/files/:file_key/styles */
-async function getFileStyles(fileKey, { logger }) {
-	const res = await fetch(API.fileStyles.replace(FILE_KEY, fileKey), {
-		method: "GET",
-		headers: { "X-Figma-Token": process.env.FIGMA_ACCESS_TOKEN }
-	});
-	if (!res.ok) logger.error({
-		group: "import",
-		message: `${res.status} ${await res.text()}`
-	});
-	return await res.json();
-}
-/** /v1/files/:file_key/variables/local */
-async function getFileLocalVariables(fileKey, { logger }) {
-	const res = await fetch(API.localVariables.replace(FILE_KEY, fileKey), {
-		method: "GET",
-		headers: { "X-Figma-Token": process.env.FIGMA_ACCESS_TOKEN }
-	});
-	if (!res.ok) logger.error({
-		group: "import",
-		message: `${res.status} ${await res.text}`
-	});
-	return await res.json();
-}
-/** /v1/files/:file_key/variables/published */
-async function getFilePublishedVariables(fileKey, { logger }) {
-	const res = await fetch(API.publishedVariables.replace(FILE_KEY, fileKey), {
-		method: "GET",
-		headers: { "X-Figma-Token": process.env.FIGMA_ACCESS_TOKEN }
-	});
-	if (!res.ok) logger.error({
-		group: "import",
-		message: `${res.status} ${await res.text}`
-	});
-	return await res.json();
-}
-
 //#endregion
 //#region src/import/figma/styles.ts
 /** /v1/files/:file_key/styles */
@@ -843,9 +850,11 @@ function textStyle(node) {
 		} : 1
 	};
 }
-
 //#endregion
 //#region src/import/figma/variables.ts
+function getAliasID(value) {
+	if (typeof value === "object" && value && "type" in value && value.type === "VARIABLE_ALIAS" && "id" in value && typeof value.id === "string") return value.id;
+}
 /** /v1/files/:file_key/variables/published | /v1/files/:file_key/variables/local */
 async function getVariables(fileKey, { logger, unpublished, matchers }) {
 	const result = {
@@ -861,19 +870,27 @@ async function getVariables(fileKey, { logger, unpublished, matchers }) {
 	let finalVariables = {};
 	const modeIDToName = {};
 	const local = await getFileLocalVariables(fileKey, { logger });
-	for (const id of Object.keys(local.meta.variables)) {
-		if (local.meta.variables[id].hiddenFromPublishing) continue;
-		allVariables[id] = local.meta.variables[id];
-	}
+	for (const id of Object.keys(local.meta.variables)) allVariables[id] = local.meta.variables[id];
 	for (const id of Object.keys(local.meta.variableCollections)) {
 		variableCollections[id] = local.meta.variableCollections[id];
 		for (const mode of local.meta.variableCollections[id].modes) modeIDToName[mode.modeId] = formatName(mode.name);
 	}
-	if (unpublished) finalVariables = allVariables;
+	if (unpublished) finalVariables = Object.fromEntries(Object.entries(allVariables).filter(([, variable]) => !variable.hiddenFromPublishing));
 	else {
 		const published = await getFilePublishedVariables(fileKey, { logger });
 		for (const id of Object.keys(published.meta.variables)) finalVariables[id] = allVariables[id];
 	}
+	const pendingIDs = Object.keys(finalVariables);
+	for (let i = 0; i < pendingIDs.length; i++) {
+		const variable = finalVariables[pendingIDs[i]];
+		if (!variable) continue;
+		for (const value of Object.values(variable.valuesByMode)) {
+			const aliasID = getAliasID(value);
+			if (!aliasID || !allVariables[aliasID] || aliasID in finalVariables) continue;
+			finalVariables[aliasID] = allVariables[aliasID];
+			pendingIDs.push(aliasID);
+		}
+	}
 	const remoteIDs = /* @__PURE__ */ new Set();
 	for (const id of Object.keys(finalVariables)) {
 		const variable = finalVariables[id];
@@ -905,7 +922,7 @@ async function getVariables(fileKey, { logger, unpublished, matchers }) {
 					codeSyntax: Object.keys(variable.codeSyntax).length ? variable.codeSyntax : void 0
 				} }
 			};
-			const isAliasOfID = typeof value === "object" && "type" in value && value.type === "VARIABLE_ALIAS" && value.id || void 0;
+			const isAliasOfID = getAliasID(value);
 			if (isAliasOfID) if (allVariables[isAliasOfID]) {
 				tokenBase.$type = matches || {
 					COLOR: "color",
@@ -971,7 +988,6 @@ async function getVariables(fileKey, { logger, unpublished, matchers }) {
 	result.remoteCount = remoteIDs.size;
 	return result;
 }
-
 //#endregion
 //#region src/import/figma/index.ts
 async function importFromFigma({ url, logger, unpublished, skipStyles, skipVariables, fontFamilyNames = "/fontFamily$", fontWeightNames = "/fontWeight$", numberNames }) {
@@ -1031,7 +1047,6 @@ function isFigmaPath(url) {
 		return false;
 	}
 }
-
 //#endregion
 //#region src/import/index.ts
 async function importCmd({ flags, positionals, logger }) {
@@ -1041,10 +1056,10 @@ async function importCmd({ flags, positionals, logger }) {
 		message: "Missing import path. Expected `tz import [file]`."
 	});
 	if (isFigmaPath(url)) {
-		const { FIGMA_ACCESS_TOKEN } = process.env;
-		if (!FIGMA_ACCESS_TOKEN) logger.error({
+		const { FIGMA_ACCESS_TOKEN, FIGMA_OAUTH_TOKEN } = process.env;
+		if (!FIGMA_ACCESS_TOKEN && !FIGMA_OAUTH_TOKEN) logger.error({
 			group: "import",
-			message: `FIGMA_ACCESS_TOKEN not set! See https://terrazzo.app/docs/guides/import-from-figma`
+			message: `Figma auth not configured! Set FIGMA_OAUTH_TOKEN (OAuth access token) or FIGMA_ACCESS_TOKEN (Personal Access Token). See https://terrazzo.app/docs/guides/import-from-figma`
 		});
 		const start = performance.now();
 		const result = await importFromFigma({
@@ -1079,7 +1094,6 @@ async function importCmd({ flags, positionals, logger }) {
 		return;
 	}
 }
-
 //#endregion
 //#region src/init.ts
 const INSTALL_COMMAND = {
@@ -1534,7 +1548,6 @@ const EXAMPLE_TOKENS = {
 		}
 	}
 };
-
 //#endregion
 //#region src/lab.ts
 async function labCmd({ config, logger }) {
@@ -1583,14 +1596,12 @@ async function labCmd({ config, logger }) {
 		server.on("error", reject);
 	});
 }
-
 //#endregion
 //#region src/version.ts
 function versionCmd() {
 	const { version } = JSON.parse(fsSync.readFileSync(new URL("../package.json", import.meta.url), "utf8"));
 	console.log(version);
 }
-
 //#endregion
 //#region src/index.ts
 const require = createRequire(cwd);
@@ -1608,7 +1619,7 @@ function defineConfig(config) {
 	});
 	return defineConfig$1(normalizedConfig, { cwd });
 }
-
 //#endregion
 export { DEFAULT_CONFIG_PATH, DEFAULT_TOKENS_PATH, GREEN_CHECK, buildCmd, checkCmd, cwd, defineConfig, formatCmd, helpCmd, importCmd, importFromFigma, initCmd, isFigmaPath, labCmd, loadConfig, loadTokens, printError, printSuccess, resolveConfig, resolveTokenPath, time, versionCmd, writeFiles };
+
 //# sourceMappingURL=index.js.map