@terrazzo/cli 0.0.12 → 0.0.14

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @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

package/bin/cli.js

@@ -23,19 +23,24 @@
  * SOFTWARE.
  */
 
-import { parse, build, defineConfig } from '@terrazzo/parser';
+import { parse, build, defineConfig, Logger } from '@terrazzo/parser';
 import chokidar from 'chokidar';
 import dotenv from 'dotenv';
 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();
 
 const [, , cmd, ...args] = process.argv;
 const cwd = new URL(`file://${process.cwd()}/`);
+const PKG_ROOT = new URL('../', import.meta.url);
+const logger = new Logger(
+  // TODO: listen for env vars for debugging, log level, etc
+);
 
 const GREEN_CHECK = pc.green('✔');
 
@@ -64,7 +69,7 @@ export default async function main() {
 
   // --version
   if (flags.version) {
-    const { version } = parseJSON(fs.readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
+    const { version } = parseJSON(fs.readFileSync(new URL('./package.json', PKG_ROOT), 'utf8'));
     console.log(version);
     process.exit(0);
   }
@@ -88,11 +93,11 @@ export default async function main() {
       const mod = await import(resolvedConfigPath);
       if (!mod.default) {
         printErrors(
-          `No default export found in ${path.relative(fileURLToPath(cwd), resolvedConfigPath)}. See https://terrazzo.dev/docs/cli for instructions.`,
+          `No default export found in ${path.relative(cwd.href, resolvedConfigPath)}. See https://terrazzo.dev/docs/cli for instructions.`,
         );
         process.exit(1);
       }
-      config = defineConfig(mod.default, { cwd });
+      config = defineConfig(mod.default, { cwd, logger });
     } catch (err) {
       printErrors(err.message || err);
       process.exit(1);
@@ -113,8 +118,8 @@ export default async function main() {
 
       const watch = args.includes('-w') || args.includes('--watch');
 
-      let { tokens, ast } = await parse(rawSchemas, { config });
-      let result = await build(tokens, { ast, config });
+      let { tokens, ast } = await parse(rawSchemas, { config, logger, yamlToMomoa });
+      let result = await build(tokens, { ast, config, logger });
       writeFiles(result, config);
 
       printErrors(result.errors);
@@ -129,10 +134,10 @@ export default async function main() {
         tokenWatcher.on('change', async (filename) => {
           try {
             rawSchemas = await loadTokens(config.tokens);
-            const parseResult = await parse(rawSchemas, { config });
+            const parseResult = await parse(rawSchemas, { config, logger, yamlToMomoa });
             tokens = parseResult.tokens;
             ast = parseResult.ast;
-            result = await build(tokens, { ast, config });
+            result = await build(tokens, { ast, config, logger });
             console.log(
               `${pc.dim(dt.format(new Date()))} ${pc.green('Tz')}} ${pc.yellow(filename)} updated ${GREEN_CHECK}`,
             );
@@ -148,10 +153,10 @@ export default async function main() {
             );
             config = (await import(filename)).default;
             rawSchema = await loadTokens(config.tokens);
-            const parseResult = await parse(tokens, { config });
+            const parseResult = await parse(tokens, { config, logger, yamlToMomoa });
             tokens = parseResult.tokens;
             ast = parseResult.ast;
-            result = await build(tokens, { ast, config });
+            result = await build(tokens, { ast, config, logger });
             writeFiles(result, config);
           } catch (err) {
             printErrors([err.message || err]);
@@ -170,19 +175,18 @@ export default async function main() {
     case 'check': {
       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 }); // will throw if errors
+      console.log(pc.underline(filename.protocol === 'file:' ? filename.href : filename));
+      await parse(rawSchemas, { config, continueOnError: true, logger, yamlToMomoa }); // will throw if errors
       printSuccess(`No errors ${time(start)}`);
       break;
     }
     case 'lint': {
       if (!Array.isArray(config.plugins) || !config.plugins.length) {
         printErrors(`No plugins defined! Add some in ${configPath || 'tokens.config.js'}`);
-        process.exit(1);
       }
 
       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, logger, yamlToMomoa }); // will throw if errors
 
       // TODO
 
@@ -194,11 +198,11 @@ export default async function main() {
         !fs.existsSync(new URL('./terrazzo.config.mjs', cwd)) &&
         !fs.existsSync(new URL('./terrazzo.config.cjs', cwd))
       ) {
-        fs.cpSync(new URL('../terrazzo.config.js', import.meta.url), new URL('./terrazzo.config.js', cwd));
+        fs.cpSync(new URL('./terrazzo.config.js', PKG_ROOT), new URL('./terrazzo.config.js', cwd));
         printSuccess('terrazzo.config.js created');
       }
       if (!fs.existsSync(config.tokens[0])) {
-        fs.cpSync(new URL('../tokens-example.json', import.meta.url), new URL(config?.tokens, cwd));
+        fs.cpSync(new URL('./tokens-example.json', PKG_ROOT), new URL(config?.tokens, cwd));
         printSuccess(`${config.tokens} created ${time(start)}`);
       }
       break;
@@ -245,6 +249,21 @@ async function loadTokens(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(cwd.href, tokenPaths[0].href)}. To create one, run \`npx tz init\`.`,
+        );
+        process.exit(1);
+      }
+    }
+  }
+
   // download/read
   for (let i = 0; i < tokenPaths.length; i++) {
     const filename = tokenPaths[i];
@@ -300,9 +319,7 @@ async function loadTokens(tokenPaths) {
       if (fs.existsSync(filename)) {
         allTokens.push({ filename, src: fs.readFileSync(filename, 'utf8') });
       } else {
-        printErrors(
-          `Could not locate ${path.relative(fileURLToPath(cwd), fileURLToPath(filename))}. To create one, run \`npx tz init\`.`,
-        );
+        printErrors(`Could not locate ${path.relative(cwd.href, filename.href)}. To create one, run \`npx tz init\`.`);
         process.exit(1);
       }
     }
@@ -320,16 +337,19 @@ function resolveConfig(filename) {
   if (filename) {
     const configPath = new URL(filename, cwd);
     if (fs.existsSync(configPath)) {
-      return fileURLToPath(configPath);
+      return configPath.href; // ⚠️ ESM wants "file://..." URLs on Windows & Unix.
     }
     return undefined;
   }
 
   // default: terrazzo.config.js
-  for (const defaultFilename of ['./terrazzo.config.js', './terrazzo.config.mjs']) {
+  for (const defaultFilename of [
+    './terrazzo.config.mjs', // .mjs takes precedence (it suggestes .js is CJS)
+    './terrazzo.config.js',
+  ]) {
     const configPath = new URL(defaultFilename, cwd);
     if (fs.existsSync(configPath)) {
-      return fileURLToPath(configPath);
+      return configPath.href; // ⚠️ ESM wants "file://..." URLs on Windows & Unix.
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terrazzo/cli",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "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,12 +36,13 @@
     "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.12",
-    "@terrazzo/token-tools": "^0.0.6"
+    "@terrazzo/parser": "^0.0.14",
+    "@terrazzo/token-tools": "^0.0.7"
   },
   "devDependencies": {
-    "typescript": "^5.5.3"
+    "typescript": "^5.5.4"
   },
   "scripts": {
     "build": "pnpm run build:clean && pnpm run build:ts",

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"}