@astryxdesign/cli 0.1.0 → 0.1.1-canary.080d887

package/src/commands/layout.mjs

@@ -0,0 +1,139 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file layout command — thin CLI wrapper around api/layout.mjs.
+ *
+ * Subcommands:
+ *   astryx layout expand "<expr>" [path]   compressed expression → validated TSX
+ *   astryx layout check "<expr>"           validate + echo both canonical surfaces
+ *   astryx layout grammar                  agent cheatsheet (alias table is branch-generated)
+ *
+ * The expression argument may also come from --file or stdin (`-`),
+ * which is how multi-line outline (XLO) input usually arrives.
+ */
+
+import * as fs from 'node:fs';
+import {jsonOut, humanLog} from '../lib/json.mjs';
+import {cliError} from '../lib/cli-error.mjs';
+import {layoutExpand, layoutCheck, layoutGrammar} from '../api/layout.mjs';
+
+/** Resolve the expression from arg, --file, or stdin ('-'). */
+async function readExpression(expr, options) {
+  if (options.file) return fs.readFileSync(options.file, 'utf-8');
+  if (expr === '-' || (!expr && !process.stdin.isTTY)) {
+    const chunks = [];
+    for await (const chunk of process.stdin) chunks.push(chunk);
+    return Buffer.concat(chunks).toString('utf-8');
+  }
+  return expr;
+}
+
+export function registerLayout(program) {
+  const layoutCmd = program
+    .command('layout')
+    .description('Generate XDS layouts from compressed expressions (XLE/XLO)');
+
+  layoutCmd
+    .command('expand [expression] [path]')
+    .description('Expand a layout expression into validated XDS TSX')
+    .option('--file <file>', 'Read the expression from a file')
+    .option('--form <form>', 'Input surface: compact, outline, or auto', 'auto')
+    .option('--name <name>', 'Generated component name (PascalCase)', 'GeneratedLayout')
+    .option('--loose', 'Downgrade unknown {block} hints to TODO placeholders')
+    .action(async (expression, targetPath, options) => {
+      const json = program.opts().json || false;
+      const source = await readExpression(expression, options);
+      if (!source || source.trim() === '') {
+        cliError('No layout expression given — pass it as an argument, via --file, or on stdin');
+        return;
+      }
+      let result;
+      try {
+        result = await layoutExpand(source, {
+          targetPath,
+          form: options.form,
+          loose: options.loose || false,
+          name: options.name,
+          cwd: process.cwd(),
+        });
+      } catch (e) {
+        cliError(e.message, {suggestions: e.suggestions || [], code: e.code});
+        return;
+      }
+      if (json) return jsonOut(result.type, result.data);
+
+      for (const warning of result.data.warnings) humanLog(`⚠ ${warning}`);
+      if (result.data.written) {
+        humanLog(`\n✓ Expanded to ${result.data.written}`);
+        humanLog(`  Components: ${result.data.componentsUsed.join(', ')}`);
+        if (result.data.todos.length > 0) {
+          humanLog(`  TODOs: ${result.data.todos.length} (search for "TODO(xle)")`);
+        }
+        humanLog('');
+      } else {
+        humanLog(result.data.code);
+      }
+    });
+
+  layoutCmd
+    .command('check [expression]')
+    .description('Validate a layout expression and echo canonical compact/outline forms')
+    .option('--file <file>', 'Read the expression from a file')
+    .option('--form <form>', 'Input surface: compact, outline, or auto', 'auto')
+    .option('--loose', 'Downgrade unknown {block} hints to TODO placeholders')
+    .action(async (expression, options) => {
+      const json = program.opts().json || false;
+      const source = await readExpression(expression, options);
+      if (!source || source.trim() === '') {
+        cliError('No layout expression given — pass it as an argument, via --file, or on stdin');
+        return;
+      }
+      let result;
+      try {
+        result = await layoutCheck(source, {
+          form: options.form,
+          loose: options.loose || false,
+          cwd: process.cwd(),
+        });
+      } catch (e) {
+        cliError(e.message, {suggestions: e.suggestions || [], code: e.code});
+        return;
+      }
+      if (json) return jsonOut(result.type, result.data);
+
+      const {valid, form, errors, warnings, compact, outline} = result.data;
+      if (!valid) {
+        humanLog(`\n✗ Invalid (${errors.length} error${errors.length === 1 ? '' : 's'}):`);
+        for (const e of errors) {
+          humanLog(`  - ${e.formatted}`);
+          if (e.suggestions?.length > 0) humanLog(`    did you mean: ${e.suggestions.join(', ')}?`);
+        }
+        humanLog('');
+        process.exitCode = 1;
+        return;
+      }
+      humanLog(`\n✓ Valid (parsed as ${form})`);
+      for (const warning of warnings) humanLog(`⚠ ${warning}`);
+      humanLog('\ncompact:');
+      humanLog(`  ${compact}`);
+      humanLog('\noutline:');
+      humanLog(outline.split('\n').map(l => `  ${l}`).join('\n'));
+      humanLog('');
+    });
+
+  layoutCmd
+    .command('grammar')
+    .description('Print the XLE/XLO cheatsheet (alias table generated from this branch)')
+    .action(async () => {
+      const json = program.opts().json || false;
+      let result;
+      try {
+        result = await layoutGrammar({cwd: process.cwd()});
+      } catch (e) {
+        cliError(e.message, {suggestions: e.suggestions || [], code: e.code});
+        return;
+      }
+      if (json) return jsonOut(result.type, result.data);
+      humanLog(result.data.text);
+    });
+}

package/src/commands/swizzle-gap-safety.test.mjs

@@ -36,7 +36,7 @@ let markerFile;
 let baseEnv;
 
 beforeAll(() => {
-  shimDir = fs.mkdtempSync(path.join(os.tmpdir(), 'xds-gh-shim-'));
+  shimDir = fs.mkdtempSync(path.join(os.tmpdir(), 'astryx-gh-shim-'));
   markerFile = path.join(shimDir, 'gh-issue-create-was-called.marker');
 
   // Sabotaged `gh` shim. Records ONLY `gh issue create` invocations to the

package/src/commands/swizzle.mjs

@@ -15,7 +15,11 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as p from '@clack/prompts';
 import {findCoreDir, listComponents} from '../utils/paths.mjs';
-import {assertWithin, PathSafetyError, isNonInteractive} from '../utils/path-safety.mjs';
+import {
+  assertWithin,
+  PathSafetyError,
+  isNonInteractive,
+} from '../utils/path-safety.mjs';
 import {isInteractive} from '../utils/interactive.mjs';
 import {jsonOut, humanLog} from '../lib/json.mjs';
 import {cliError} from '../lib/cli-error.mjs';
@@ -104,7 +108,9 @@ export function registerSwizzle(program) {
         }
         humanLog(`\nUsage: astryx swizzle <component>\n`);
         humanLog('Example: astryx swizzle Button');
-        humanLog('         astryx swizzle XDSButton  (XDS prefix also works)\n');
+        humanLog(
+          '         astryx swizzle XDSButton  (XDS prefix also works)\n',
+        );
         return;
       }
 
@@ -112,10 +118,10 @@ export function registerSwizzle(program) {
       const componentDir = path.join(coreDir, 'src', dirName);
 
       if (!fs.existsSync(componentDir)) {
-        cliError(
-          `Component "${component}" not found.`,
-          {suggestions: components.slice(0, 10).map((n) => ({name: n})), code: ERROR_CODES.ERR_UNKNOWN_COMPONENT},
-        );
+        cliError(`Component "${component}" not found.`, {
+          suggestions: components.slice(0, 10).map(n => ({name: n})),
+          code: ERROR_CODES.ERR_UNKNOWN_COMPONENT,
+        });
         return;
       }
 
@@ -196,11 +202,16 @@ export function registerSwizzle(program) {
       }
 
       const relOutput = path.relative(process.cwd(), outputDir);
-      const copiedFiles = files.filter(f => !f.includes('.test.') && f !== 'README.md' && fs.statSync(path.join(componentDir, f)).isFile());
+      const copiedFiles = files.filter(
+        f =>
+          !f.includes('.test.') &&
+          f !== 'README.md' &&
+          fs.statSync(path.join(componentDir, f)).isFile(),
+      );
 
       // --- Gap reporting ---
 
-      const gapConfig = loadGapReportConfig();
+      const gapConfig = await loadGapReportConfig();
       let gapReportUrl = null;
       let gapDryRunPreview = null;
 
@@ -224,7 +235,7 @@ export function registerSwizzle(program) {
           json,
         });
 
-        const preview = buildGapReportPreview(previewArgs);
+        const preview = await buildGapReportPreview(previewArgs);
 
         if (!willFile) {
           // Dry-run: do NOT call gh. Surface what would have been filed.
@@ -239,10 +250,12 @@ export function registerSwizzle(program) {
           };
         } else if (gapConfig.command || checkGhCli()) {
           try {
-            gapReportUrl = createGapReport(previewArgs);
+            gapReportUrl = await createGapReport(previewArgs);
           } catch (err) {
             if (!json)
-              console.error(`Warning: Could not file gap report: ${err.message}`);
+              console.error(
+                `Warning: Could not file gap report: ${err.message}`,
+              );
           }
         }
       }
@@ -259,17 +272,23 @@ export function registerSwizzle(program) {
             gapReportSuppressed: reportingSuppressed || !gapConfig.enabled,
           });
         humanLog(`\n✓ Copied ${copied} files to ${relOutput}/\n`);
-        humanLog('Relative imports have been rewritten to use @astryxdesign/core.');
+        humanLog(
+          'Relative imports have been rewritten to use @astryxdesign/core.',
+        );
         humanLog('You can now customize the component source freely.\n');
         if (gapReportUrl) {
           humanLog(`✓ Gap report filed: ${gapReportUrl}\n`);
         } else if (gapDryRunPreview) {
-          humanLog(formatPreview(buildGapReportPreview({
-            component: dirName,
-            category: options.gapCategory || 'other',
-            intention: options.gap,
-            source: 'llm-auto',
-          })));
+          humanLog(
+            formatPreview(
+              await buildGapReportPreview({
+                component: dirName,
+                category: options.gapCategory || 'other',
+                intention: options.gap,
+                source: 'llm-auto',
+              }),
+            ),
+          );
           humanLog(
             '\n[dry-run] No gap report was filed. Re-run with --commit to file.',
           );
@@ -283,10 +302,18 @@ export function registerSwizzle(program) {
         return;
       }
 
-      if (json) return jsonOut('swizzle.copy', {component: dirName, outputDir: relOutput, filesCopied: copied, files: copiedFiles.map(f => f)});
+      if (json)
+        return jsonOut('swizzle.copy', {
+          component: dirName,
+          outputDir: relOutput,
+          filesCopied: copied,
+          files: copiedFiles.map(f => f),
+        });
 
       humanLog(`\n✓ Copied ${copied} files to ${relOutput}/\n`);
-      humanLog('Relative imports have been rewritten to use @astryxdesign/core.');
+      humanLog(
+        'Relative imports have been rewritten to use @astryxdesign/core.',
+      );
       humanLog('You can now customize the component source freely.\n');
 
       if (reportingSuppressed || !gapConfig.enabled) {
@@ -330,7 +357,8 @@ export function registerSwizzle(program) {
           placeholder:
             'e.g. "Need a compact variant for use in dense data tables"',
           validate: val => {
-            if (!val.trim()) return 'Please describe what you were trying to do';
+            if (!val.trim())
+              return 'Please describe what you were trying to do';
           },
         }),
       );
@@ -350,7 +378,7 @@ export function registerSwizzle(program) {
         source: 'interactive',
       };
 
-      const preview = buildGapReportPreview(previewArgs);
+      const preview = await buildGapReportPreview(previewArgs);
 
       p.note(
         `${preview.mode === 'github' ? `Repo: ${preview.repo}` : `Custom command: ${preview.command}`}\n\n` +
@@ -378,7 +406,7 @@ export function registerSwizzle(program) {
       s.start('Filing gap report');
 
       try {
-        const url = createGapReport(previewArgs);
+        const url = await createGapReport(previewArgs);
         s.stop('Gap report filed');
         humanLog(`✓ ${url}\n`);
       } catch (err) {

package/src/commands/swizzle.path-safety.test.mjs

@@ -58,7 +58,7 @@ function runCli(args, cwd) {
 
 let tmpDir;
 beforeEach(() => {
-  tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'xds-swizzle-paths-'));
+  tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'astryx-swizzle-paths-'));
 });
 afterEach(() => {
   fs.rmSync(tmpDir, {recursive: true, force: true});

package/src/commands/template.path-safety.test.mjs

@@ -17,7 +17,7 @@ let tmpDir;
 let templateApi;
 
 beforeEach(async () => {
-  tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'xds-template-paths-'));
+  tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'astryx-template-paths-'));
   templateApi = (await import('../api/template.mjs')).template;
 });
 afterEach(() => {

package/src/commands/template.test.mjs

@@ -12,7 +12,7 @@ import * as os from 'node:os';
 let tmpDir;
 
 beforeEach(() => {
-  tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'xds-template-test-'));
+  tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'astryx-template-test-'));
 });
 
 afterEach(() => {