@terrazzo/cli 0.0.11 → 0.0.13

package/CHANGELOG.md

@@ -0,0 +1,20 @@
+# @terrazzo/cli
+
+## 0.0.13
+
+### Patch Changes
+
+- [#289](https://github.com/terrazzoapp/terrazzo/pull/289) [`0fc9738`](https://github.com/terrazzoapp/terrazzo/commit/0fc9738bb3dfecb680d225e4bd3970f21cfe8079) Thanks [@drwpow](https://github.com/drwpow)! - Add YAML support
+
+- Updated dependencies [[`0fc9738`](https://github.com/terrazzoapp/terrazzo/commit/0fc9738bb3dfecb680d225e4bd3970f21cfe8079), [`6a875b1`](https://github.com/terrazzoapp/terrazzo/commit/6a875b163539dba8111911851a7819732056b3aa)]:
+  - @terrazzo/parser@0.0.13
+
+## 0.0.12
+
+### Patch Changes
+
+- [#285](https://github.com/terrazzoapp/terrazzo/pull/285) [`e8a0df1`](https://github.com/terrazzoapp/terrazzo/commit/e8a0df1f3b50cf7cb292bcc475aae271feae4569) Thanks [@drwpow](https://github.com/drwpow)! - Add support for multiple token files
+
+- Updated dependencies [[`e8a0df1`](https://github.com/terrazzoapp/terrazzo/commit/e8a0df1f3b50cf7cb292bcc475aae271feae4569)]:
+  - @terrazzo/token-tools@0.0.6
+  - @terrazzo/parser@0.0.12

package/bin/cli.js

@@ -30,6 +30,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import pc from 'picocolors';
+import yamlToMomoa from 'yaml-to-momoa';
 import parser from 'yargs-parser';
 
 dotenv.config();
@@ -109,11 +110,11 @@ export default async function main() {
         process.exit(1);
       }
 
-      let rawSchema = await loadTokens(config.tokens);
+      let rawSchemas = await loadTokens(config.tokens);
 
       const watch = args.includes('-w') || args.includes('--watch');
 
-      let { tokens, ast } = await parse(rawSchema, { config });
+      let { tokens, ast } = await parse(rawSchemas, { config, yamlToMomoa });
       let result = await build(tokens, { ast, config });
       writeFiles(result, config);
 
@@ -125,30 +126,30 @@ export default async function main() {
           hour: '2-digit',
           minute: '2-digit',
         });
-        const tokenWatcher = chokidar.watch(config.tokens.map((filepath) => fileURLToPath(filepath)));
-        tokenWatcher.on('change', async (filePath) => {
+        const tokenWatcher = chokidar.watch(config.tokens.map((filename) => fileURLToPath(filename)));
+        tokenWatcher.on('change', async (filename) => {
           try {
-            rawSchema = await loadTokens(config.tokens);
-            const parseResult = await parse(tokens, { config });
+            rawSchemas = await loadTokens(config.tokens);
+            const parseResult = await parse(rawSchemas, { config, yamlToMomoa });
             tokens = parseResult.tokens;
             ast = parseResult.ast;
             result = await build(tokens, { ast, config });
             console.log(
-              `${pc.dim(dt.format(new Date()))} ${pc.green('Tz')}} ${pc.yellow(filePath)} updated ${GREEN_CHECK}`,
+              `${pc.dim(dt.format(new Date()))} ${pc.green('Tz')}} ${pc.yellow(filename)} updated ${GREEN_CHECK}`,
             );
           } catch (err) {
             printErrors([err.message || err]);
           }
         });
         const configWatcher = chokidar.watch(resolveConfig(configPath));
-        configWatcher.on('change', async (filePath) => {
+        configWatcher.on('change', async (filename) => {
           try {
             console.log(
               `${pc.dim(dt.format(new Date()))} ${pc.green('Tz')} ${pc.yellow('Config updated. Reloading…')}`,
             );
-            config = (await import(filePath)).default;
+            config = (await import(filename)).default;
             rawSchema = await loadTokens(config.tokens);
-            const parseResult = await parse(tokens, { config });
+            const parseResult = await parse(tokens, { config, yamlToMomoa });
             tokens = parseResult.tokens;
             ast = parseResult.ast;
             result = await build(tokens, { ast, config });
@@ -168,10 +169,10 @@ export default async function main() {
       break;
     }
     case 'check': {
-      const rawSchema = await loadTokens(flags._[0] ? [resolveTokenPath(flags._[0])] : config.tokens);
-      const filepath = flags._[0] || config.tokens[0];
-      console.log(pc.underline(filepath.protocol === 'file:' ? fileURLToPath(filepath) : filepath));
-      await parse(rawSchema, { config, continueOnError: true }); // will throw if errors
+      const rawSchemas = await loadTokens(flags._[0] ? [resolveTokenPath(flags._[0])] : config.tokens);
+      const filename = flags._[0] || config.tokens[0];
+      console.log(pc.underline(filename.protocol === 'file:' ? fileURLToPath(filename) : filename));
+      await parse(rawSchemas, { config, continueOnError: true, yamlToMomoa }); // will throw if errors
       printSuccess(`No errors ${time(start)}`);
       break;
     }
@@ -182,7 +183,7 @@ export default async function main() {
       }
 
       const rawSchema = await loadTokens(flags._[0] ? [resolveTokenPath(flags._[0])] : config.tokens);
-      const parseResult = await parse(rawSchema, { config, continueOnError: true }); // will throw if errors
+      const parseResult = await parse(rawSchema, { config, continueOnError: true, yamlToMomoa }); // will throw if errors
 
       // TODO
 
@@ -238,21 +239,45 @@ function showHelp() {
 
 /** load tokens */
 async function loadTokens(tokenPaths) {
-  // TODO: merge tokens
-
   const allTokens = [];
 
+  if (!Array.isArray(tokenPaths)) {
+    printErrors(`loadTokens: Expected array, received ${typeof tokenPaths}`);
+    process.exit(1);
+  }
+
+  // if this is the default value, also check for tokens.yaml
+  if (tokenPaths.length === 1 && tokenPaths[0].href === new URL('./tokens.json', cwd).href) {
+    if (!fs.existsSync(tokenPaths[0])) {
+      const yamlPath = new URL('./tokens.yaml', cwd);
+      if (fs.existsSync(yamlPath)) {
+        tokenPaths[0] = yamlPath;
+      } else {
+        printErrors(
+          `Could not locate ${path.relative(fileURLToPath(cwd), fileURLToPath(tokenPaths[0]))}. To create one, run \`npx tz init\`.`,
+        );
+        process.exit(1);
+      }
+    }
+  }
+
   // download/read
   for (let i = 0; i < tokenPaths.length; i++) {
-    const filepath = tokenPaths[i];
-    if (filepath.protocol === 'http:' || filepath.protocol === 'https:') {
+    const filename = tokenPaths[i];
+
+    if (!(filename instanceof URL)) {
+      printErrors(`loadTokens[${i}]: Expected URL, received ${filename}`);
+      process.exit(1);
+    }
+
+    if (filename.protocol === 'http:' || filename.protocol === 'https:') {
       try {
         // if Figma URL
-        if (filepath.host === 'figma.com' || filepath.host === 'www.figma.com') {
-          const [_, fileKeyword, fileKey] = filepath.pathname.split('/');
+        if (filename.host === 'figma.com' || filename.host === 'www.figma.com') {
+          const [_, fileKeyword, fileKey] = filename.pathname.split('/');
           if (fileKeyword !== 'file' || !fileKey) {
             printErrors(
-              `Unexpected Figma URL. Expected "https://www.figma.com/file/:file_key/:file_name?…", received "${filepath.href}"`,
+              `Unexpected Figma URL. Expected "https://www.figma.com/file/:file_key/:file_name?…", received "${filename.href}"`,
             );
             process.exit(1);
           }
@@ -270,7 +295,7 @@ async function loadTokens(tokenPaths) {
             headers,
           });
           if (res.ok) {
-            allTokens.push(await res.text());
+            allTokens.push({ filename, src: await res.text() });
           }
           const message = res.status !== 404 ? JSON.stringify(await res.json(), undefined, 2) : '';
           printErrors(`Figma responded with ${res.status}${message ? `:\n${message}` : ''}`);
@@ -279,27 +304,27 @@ async function loadTokens(tokenPaths) {
         }
 
         // otherwise, expect YAML/JSON
-        const res = await fetch(filepath, {
+        const res = await fetch(filename, {
           method: 'GET',
           headers: { Accept: '*/*', 'User-Agent': 'Mozilla/5.0 Gecko/20100101 Firefox/123.0' },
         });
-        allTokens.push(await res.text());
+        allTokens.push({ filename, src: await res.text() });
       } catch (err) {
-        printErrors(`${filepath.href}: ${err}`);
+        printErrors(`${filename.href}: ${err}`);
       }
     } else {
-      if (fs.existsSync(filepath)) {
-        allTokens.push(fs.readFileSync(filepath, 'utf8'));
+      if (fs.existsSync(filename)) {
+        allTokens.push({ filename, src: fs.readFileSync(filename, 'utf8') });
       } else {
         printErrors(
-          `Could not locate ${path.relative(fileURLToPath(cwd), fileURLToPath(filepath))}. To create one, run \`npx tz init\`.`,
+          `Could not locate ${path.relative(fileURLToPath(cwd), fileURLToPath(filename))}. To create one, run \`npx tz init\`.`,
         );
         process.exit(1);
       }
     }
   }
 
-  return allTokens[0];
+  return allTokens;
 }
 
 /**
@@ -326,14 +351,14 @@ function resolveConfig(filename) {
 }
 
 /** Resolve tokens.json path (for lint command) */
-function resolveTokenPath(filepath) {
-  const tokensPath = new URL(filepath, cwd);
+function resolveTokenPath(filename) {
+  const tokensPath = new URL(filename, cwd);
   if (!fs.existsSync(tokensPath)) {
-    printErrors(`Could not locate ${filepath}. Does the file exist?`);
+    printErrors(`Could not locate ${filename}. Does the file exist?`);
     process.exit(1);
   }
   if (!fs.statSync(tokensPath).isFile()) {
-    printErrors(`Expected JSON or YAML file, received ${filepath}.`);
+    printErrors(`Expected JSON or YAML file, received ${filename}.`);
     process.exit(1);
   }
   return tokensPath;
@@ -373,8 +398,8 @@ export function printWarnings(warnings) {
 /** Write files */
 export function writeFiles(result, config) {
   for (const { filename, contents } of result.outputFiles) {
-    const filepath = new URL(filename, config.outDir);
-    fs.mkdirSync(new URL('.', filepath), { recursive: true });
-    fs.writeFileSync(filepath, contents);
+    const output = new URL(filename, config.outDir);
+    fs.mkdirSync(new URL('.', output), { recursive: true });
+    fs.writeFileSync(output, contents);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terrazzo/cli",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "CLI for managing design tokens using the Design Tokens Community Group (DTCG) standard and generating code for any platform via plugins.",
   "type": "module",
   "author": {
@@ -36,16 +36,17 @@
     "dotenv": "^16.4.5",
     "merge-anything": "^5.1.7",
     "picocolors": "^1.0.1",
+    "yaml-to-momoa": "^0.0.1",
     "yargs-parser": "^21.1.1",
-    "@terrazzo/parser": "^0.0.11",
-    "@terrazzo/token-tools": "^0.0.4"
+    "@terrazzo/parser": "^0.0.13",
+    "@terrazzo/token-tools": "^0.0.6"
   },
   "devDependencies": {
-    "typescript": "^5.5.3"
+    "typescript": "^5.5.4"
   },
   "scripts": {
     "build": "pnpm run build:clean && pnpm run build:ts",
-    "build:clean": "del dist",
+    "build:clean": "del-cli dist",
     "build:ts": "tsc -p tsconfig.build.json",
     "dev": "tsc -p tsconfig.build.json -w",
     "lint": "biome check .",

package/dist/index.d.ts

@@ -1,2 +0,0 @@
-import { type Config, type ConfigInit } from '@terrazzo/parser';
-export declare function defineConfig(config: Config): ConfigInit;

package/dist/index.js

@@ -1,5 +0,0 @@
-import { defineConfig as defineConfigCore } from '@terrazzo/parser';
-export function defineConfig(config) {
-    return defineConfigCore(config, { cwd: new URL(`file://${process.cwd()}/`) });
-}
-//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,YAAY,IAAI,gBAAgB,EAAmB,MAAM,kBAAkB,CAAC;AAElG,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,OAAO,gBAAgB,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,GAAG,CAAC,UAAU,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;AAChF,CAAC"}