@objectstack/cli 2.0.7 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@objectstack/cli",
-  "version": "2.0.7",
+  "version": "3.0.0",
   "description": "Command Line Interface for ObjectStack Protocol",
   "main": "dist/index.js",
   "bin": {
@@ -22,16 +22,16 @@
     "commander": "^14.0.3",
     "tsx": "^4.7.1",
     "zod": "^4.3.6",
-    "@objectstack/core": "2.0.7",
-    "@objectstack/driver-memory": "^2.0.7",
-    "@objectstack/objectql": "^2.0.7",
-    "@objectstack/plugin-hono-server": "2.0.7",
-    "@objectstack/rest": "2.0.7",
-    "@objectstack/runtime": "^2.0.7",
-    "@objectstack/spec": "2.0.7"
+    "@objectstack/core": "3.0.0",
+    "@objectstack/driver-memory": "^3.0.0",
+    "@objectstack/objectql": "^3.0.0",
+    "@objectstack/plugin-hono-server": "3.0.0",
+    "@objectstack/rest": "3.0.0",
+    "@objectstack/runtime": "^3.0.0",
+    "@objectstack/spec": "3.0.0"
   },
   "peerDependencies": {
-    "@objectstack/core": "2.0.7"
+    "@objectstack/core": "3.0.0"
   },
   "devDependencies": {
     "@types/node": "^25.2.2",

package/src/commands/generate.ts

@@ -204,11 +204,110 @@ function toSnakeCase(str: string): string {
   return str.replace(/[-]/g, '_').replace(/[A-Z]/g, c => `_${c.toLowerCase()}`).replace(/^_/, '');
 }
 
+// ─── Field Type Mapping ─────────────────────────────────────────────
+
+const FIELD_TYPE_MAP: Record<string, string> = {
+  text: 'string',
+  textarea: 'string',
+  richtext: 'string',
+  html: 'string',
+  markdown: 'string',
+  number: 'number',
+  integer: 'number',
+  currency: 'number',
+  percent: 'number',
+  boolean: 'boolean',
+  date: 'string',
+  datetime: 'string',
+  time: 'string',
+  email: 'string',
+  phone: 'string',
+  url: 'string',
+  select: 'string',
+  multiselect: 'string[]',
+  lookup: 'string',
+  master_detail: 'string',
+  formula: 'unknown',
+  autonumber: 'string',
+  json: 'Record<string, unknown>',
+  file: 'string',
+  image: 'string',
+  password: 'string',
+  slug: 'string',
+  uuid: 'string',
+  ip_address: 'string',
+  color: 'string',
+  rating: 'number',
+  geo_point: '{ lat: number; lng: number }',
+  vector: 'number[]',
+  encrypted: 'string',
+};
+
+function fieldTypeToTs(fieldType: string, multiple?: boolean): string {
+  const base = FIELD_TYPE_MAP[fieldType] || 'unknown';
+  return multiple ? `${base}[]` : base;
+}
+
+function generateTypesFromConfig(config: Record<string, unknown>): string {
+  const lines: string[] = [
+    '// Auto-generated by ObjectStack CLI — do not edit manually',
+    `// Generated at ${new Date().toISOString()}`,
+    '',
+    "import type { Data } from '@objectstack/spec';",
+    '',
+  ];
+
+  // Extract objects from config (supports both top-level and nested)
+  const objects: Record<string, unknown>[] = [];
+  const rawObjects = (config as any).objects ?? (config as any).data?.objects ?? {};
+
+  if (Array.isArray(rawObjects)) {
+    objects.push(...rawObjects);
+  } else if (typeof rawObjects === 'object') {
+    for (const val of Object.values(rawObjects)) {
+      if (val && typeof val === 'object') objects.push(val as Record<string, unknown>);
+    }
+  }
+
+  if (objects.length === 0) {
+    lines.push('// No objects found in configuration');
+    return lines.join('\n') + '\n';
+  }
+
+  for (const obj of objects) {
+    const name = String(obj.name || 'unknown');
+    const typeName = name
+      .split('_')
+      .map((w: string) => w.charAt(0).toUpperCase() + w.slice(1))
+      .join('');
+    const fields = (obj.fields ?? {}) as Record<string, Record<string, unknown>>;
+
+    lines.push(`/** ${String(obj.label || typeName)} record type */`);
+    lines.push(`export interface ${typeName}Record {`);
+    lines.push('  id: string;');
+
+    for (const [fieldName, fieldDef] of Object.entries(fields)) {
+      const fType = String(fieldDef.type || 'text');
+      const tsType = fieldTypeToTs(fType, !!fieldDef.multiple);
+      const required = fieldDef.required ? '' : '?';
+      if (fieldDef.label) {
+        lines.push(`  /** ${fieldDef.label} */`);
+      }
+      lines.push(`  ${fieldName}${required}: ${tsType};`);
+    }
+
+    lines.push('}');
+    lines.push('');
+  }
+
+  return lines.join('\n') + '\n';
+}
+
 // ─── Command ────────────────────────────────────────────────────────
 
-export const generateCommand = new Command('generate')
-  .alias('g')
-  .description('Generate metadata files (object, view, action, flow, agent, dashboard, app)')
+const generateMetadataCommand = new Command('metadata')
+  .alias('m')
+  .description('Generate metadata scaffold (object, view, action, flow, agent, dashboard, app)')
   .argument('<type>', 'Metadata type to generate')
   .argument('<name>', 'Name for the metadata (use kebab-case)')
   .option('-d, --dir <directory>', 'Target directory (overrides default)')
@@ -297,3 +396,82 @@ export const generateCommand = new Command('generate')
       process.exit(1);
     }
   });
+
+const generateTypesCommand = new Command('types')
+  .description('Generate TypeScript type definitions from ObjectStack configuration')
+  .argument('[config]', 'Configuration file path')
+  .option('-o, --output <file>', 'Output file path', 'src/types/objectstack.d.ts')
+  .option('--dry-run', 'Show what would be generated without writing files')
+  .action(async (configPath, options) => {
+    printHeader('Generate Types');
+
+    try {
+      const { loadConfig } = await import('../utils/config.js');
+      printInfo('Loading configuration...');
+      const { config, absolutePath } = await loadConfig(configPath);
+
+      console.log(`  ${chalk.dim('Config:')} ${chalk.white(absolutePath)}`);
+      console.log(`  ${chalk.dim('Output:')} ${chalk.white(options.output)}`);
+      console.log('');
+
+      const content = generateTypesFromConfig(config as Record<string, unknown>);
+
+      if (options.dryRun) {
+        printInfo('Dry run — no files written');
+        console.log('');
+        for (const line of content.split('\n')) {
+          console.log(chalk.dim(`  ${line}`));
+        }
+        console.log('');
+        return;
+      }
+
+      const outPath = path.resolve(process.cwd(), options.output);
+      const outDir = path.dirname(outPath);
+      if (!fs.existsSync(outDir)) {
+        fs.mkdirSync(outDir, { recursive: true });
+      }
+      fs.writeFileSync(outPath, content);
+      printSuccess(`Generated types at ${options.output}`);
+      console.log('');
+
+    } catch (error: any) {
+      printError(error.message || String(error));
+      process.exit(1);
+    }
+  });
+
+export const generateCommand = new Command('generate')
+  .alias('g')
+  .description('Generate metadata files or TypeScript types')
+  .argument('[type]', 'Metadata type to generate (object, view, action, flow, agent, dashboard, app)')
+  .argument('[name]', 'Name for the metadata (use kebab-case)')
+  .option('-d, --dir <directory>', 'Target directory (overrides default)')
+  .option('--dry-run', 'Show what would be created without writing files')
+  .addCommand(generateTypesCommand)
+  .action(async (type: string | undefined, name: string | undefined, options) => {
+    if (!type) {
+      printHeader('Generate');
+      console.log(chalk.bold('  Sub-commands:'));
+      console.log(`    ${chalk.cyan('types'.padEnd(12))} Generate TypeScript type definitions from config`);
+      console.log('');
+      console.log(chalk.bold('  Metadata types:'));
+      for (const [key, gen] of Object.entries(GENERATORS)) {
+        console.log(`    ${chalk.cyan(key.padEnd(12))} ${chalk.dim(gen.description)}`);
+      }
+      console.log('');
+      console.log(chalk.dim('  Usage: objectstack generate <type> <name>'));
+      console.log(chalk.dim('  Usage: objectstack generate types [config]'));
+      return;
+    }
+
+    // Delegate to metadata command action
+    if (!name) {
+      printError('Missing required argument: <name>');
+      console.log(chalk.dim('  Usage: objectstack generate <type> <name>'));
+      process.exit(1);
+    }
+
+    // Execute metadata generation inline
+    await generateMetadataCommand.parseAsync([type, name, ...process.argv.slice(4)], { from: 'user' });
+  });