omni-rest 0.2.7 → 0.3.0

package/README.md

@@ -517,8 +517,8 @@ MIT © [Omni Rest Contributors](LICENSE)
 ## Support
 
 - 📖 [Documentation](docs/)
-- 🙋 [GitHub Discussions](https://github.com/omni-rest/omni-rest/discussions)
-- 🐛 [Report Issues](https://github.com/omni-rest/omni-rest/issues)
+- 🙋 [GitHub Discussions](https://github.com/Abdulllah321/omni-rest/discussions)
+- 🐛 [Report Issues](https://github.com/Abdulllah321/omni-rest/issues)
 - 💬 [Chat on Discord](https://discord.gg/omni-rest)
 
 ## Acknowledgments

package/dist/cli.js

@@ -2,7 +2,7 @@
 'use strict';
 
 var fs3 = require('fs');
-var path = require('path');
+var path3 = require('path');
 var readline = require('readline');
 
 function _interopNamespace(e) {
@@ -24,7 +24,7 @@ function _interopNamespace(e) {
 }
 
 var fs3__namespace = /*#__PURE__*/_interopNamespace(fs3);
-var path__namespace = /*#__PURE__*/_interopNamespace(path);
+var path3__namespace = /*#__PURE__*/_interopNamespace(path3);
 var readline__namespace = /*#__PURE__*/_interopNamespace(readline);
 
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
@@ -479,7 +479,7 @@ function buildListParameters() {
 }
 var EXCLUDED_DIRS = /* @__PURE__ */ new Set(["node_modules", ".git", "dist", "build", ".next", "out"]);
 function readPackageJson(dir) {
-  const pkgPath = path__namespace.join(dir, "package.json");
+  const pkgPath = path3__namespace.join(dir, "package.json");
   try {
     const content = fs3__namespace.readFileSync(pkgPath, "utf-8");
     return JSON.parse(content);
@@ -490,14 +490,14 @@ function readPackageJson(dir) {
 function scoreDir(dir, cwd2) {
   let score = 0;
   const signals = [];
-  if (fs3__namespace.existsSync(path__namespace.join(dir, "next.config.js")) || fs3__namespace.existsSync(path__namespace.join(dir, "next.config.ts"))) {
+  if (fs3__namespace.existsSync(path3__namespace.join(dir, "next.config.js")) || fs3__namespace.existsSync(path3__namespace.join(dir, "next.config.ts"))) {
     score += 10;
-    const file = fs3__namespace.existsSync(path__namespace.join(dir, "next.config.js")) ? "next.config.js" : "next.config.ts";
+    const file = fs3__namespace.existsSync(path3__namespace.join(dir, "next.config.js")) ? "next.config.js" : "next.config.ts";
     signals.push(`${file} found`);
   }
-  if (fs3__namespace.existsSync(path__namespace.join(dir, "vite.config.ts")) || fs3__namespace.existsSync(path__namespace.join(dir, "vite.config.js"))) {
+  if (fs3__namespace.existsSync(path3__namespace.join(dir, "vite.config.ts")) || fs3__namespace.existsSync(path3__namespace.join(dir, "vite.config.js"))) {
     score += 10;
-    const file = fs3__namespace.existsSync(path__namespace.join(dir, "vite.config.ts")) ? "vite.config.ts" : "vite.config.js";
+    const file = fs3__namespace.existsSync(path3__namespace.join(dir, "vite.config.ts")) ? "vite.config.ts" : "vite.config.js";
     signals.push(`${file} found`);
   }
   const pkg = readPackageJson(dir);
@@ -512,19 +512,19 @@ function scoreDir(dir, cwd2) {
       signals.push("react in devDependencies");
     }
   }
-  if (path__namespace.resolve(dir) === path__namespace.resolve(cwd2)) {
+  if (path3__namespace.resolve(dir) === path3__namespace.resolve(cwd2)) {
     score += 2;
     signals.push("current working directory");
   }
   if (score === 0) return null;
   return {
-    dir: path__namespace.resolve(dir),
+    dir: path3__namespace.resolve(dir),
     score,
     signals
   };
 }
 function walk(dir, cwd2, currentDepth, maxDepth, results) {
-  const absDir = path__namespace.resolve(dir);
+  const absDir = path3__namespace.resolve(dir);
   const candidate = scoreDir(absDir, cwd2);
   if (candidate && !results.has(absDir)) {
     results.set(absDir, candidate);
@@ -539,7 +539,7 @@ function walk(dir, cwd2, currentDepth, maxDepth, results) {
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
     if (EXCLUDED_DIRS.has(entry.name)) continue;
-    walk(path__namespace.join(absDir, entry.name), cwd2, currentDepth + 1, maxDepth, results);
+    walk(path3__namespace.join(absDir, entry.name), cwd2, currentDepth + 1, maxDepth, results);
   }
 }
 function scoreCandidates(dir) {
@@ -553,7 +553,7 @@ async function scanForFrontendDir(dir) {
 }
 async function findSchema(startDir, explicitPath) {
   if (explicitPath !== void 0) {
-    const resolved = path__namespace.resolve(explicitPath);
+    const resolved = path3__namespace.resolve(explicitPath);
     if (!fs3__namespace.existsSync(resolved)) {
       throw new Error(
         `[omni-rest] Schema file not found at the specified path: "${resolved}"
@@ -562,18 +562,18 @@ Please check that the path is correct and the file is readable.`
     }
     return resolved;
   }
-  let current = path__namespace.resolve(startDir);
+  let current = path3__namespace.resolve(startDir);
   while (true) {
     const candidates = [
-      path__namespace.join(current, "prisma", "schema.prisma"),
-      path__namespace.join(current, "schema.prisma")
+      path3__namespace.join(current, "prisma", "schema.prisma"),
+      path3__namespace.join(current, "schema.prisma")
     ];
     for (const candidate of candidates) {
       if (fs3__namespace.existsSync(candidate)) {
         return candidate;
       }
     }
-    const parent = path__namespace.dirname(current);
+    const parent = path3__namespace.dirname(current);
     if (parent === current) {
       throw new Error(
         `[omni-rest] Could not find "schema.prisma" by walking up from "${startDir}".
@@ -589,8 +589,8 @@ async function loadDMMF(frontendDir, schemaPath) {
     const schemaContent = fs3__namespace.readFileSync(schemaPath, "utf-8");
     const outputMatch = schemaContent.match(/output\s*=\s*["']([^"']+)["']/);
     if (outputMatch) {
-      const schemaDir = path__namespace.dirname(schemaPath);
-      const customOutput = path__namespace.resolve(schemaDir, outputMatch[1]);
+      const schemaDir = path3__namespace.dirname(schemaPath);
+      const customOutput = path3__namespace.resolve(schemaDir, outputMatch[1]);
       if (fs3__namespace.existsSync(customOutput)) {
         clientPath = customOutput;
       }
@@ -598,7 +598,7 @@ async function loadDMMF(frontendDir, schemaPath) {
   } catch {
   }
   if (!clientPath) {
-    clientPath = path__namespace.join(frontendDir, "node_modules", "@prisma", "client");
+    clientPath = path3__namespace.join(frontendDir, "node_modules", "@prisma", "client");
   }
   let prismaClientModule;
   try {
@@ -631,12 +631,35 @@ Please run "npx prisma generate" to regenerate the Prisma client, then try again
   };
   return getModels(syntheticPrisma);
 }
+function detectProjectStructure(frontendDir) {
+  const hasSrc = fs3__namespace.existsSync(path3__namespace.join(frontendDir, "src"));
+  const hasApp = fs3__namespace.existsSync(path3__namespace.join(frontendDir, "app"));
+  const hasSrcApp = fs3__namespace.existsSync(path3__namespace.join(frontendDir, "src", "app"));
+  const hasPages = fs3__namespace.existsSync(path3__namespace.join(frontendDir, "pages"));
+  const hasSrcPages = fs3__namespace.existsSync(path3__namespace.join(frontendDir, "src", "pages"));
+  const usesAppRouter = hasApp || hasSrcApp;
+  const usesPagesRouter = hasPages || hasSrcPages;
+  const basePath = hasSrc ? "src" : ".";
+  let appPath = null;
+  if (hasSrcApp) {
+    appPath = path3__namespace.join(frontendDir, "src", "app");
+  } else if (hasApp) {
+    appPath = path3__namespace.join(frontendDir, "app");
+  }
+  return {
+    usesSrc: hasSrc,
+    usesAppRouter,
+    usesPagesRouter,
+    basePath,
+    appPath
+  };
+}
 function detectFramework(frontendDir) {
-  const hasNextConfig = fs3__namespace.existsSync(path__namespace.join(frontendDir, "next.config.js")) || fs3__namespace.existsSync(path__namespace.join(frontendDir, "next.config.ts"));
+  const hasNextConfig = fs3__namespace.existsSync(path3__namespace.join(frontendDir, "next.config.js")) || fs3__namespace.existsSync(path3__namespace.join(frontendDir, "next.config.ts"));
   if (hasNextConfig) return "nextjs";
-  const hasViteConfig = fs3__namespace.existsSync(path__namespace.join(frontendDir, "vite.config.ts")) || fs3__namespace.existsSync(path__namespace.join(frontendDir, "vite.config.js"));
+  const hasViteConfig = fs3__namespace.existsSync(path3__namespace.join(frontendDir, "vite.config.ts")) || fs3__namespace.existsSync(path3__namespace.join(frontendDir, "vite.config.js"));
   if (hasViteConfig) return "vite-react";
-  const pkgPath = path__namespace.join(frontendDir, "package.json");
+  const pkgPath = path3__namespace.join(frontendDir, "package.json");
   if (fs3__namespace.existsSync(pkgPath)) {
     try {
       const pkg = JSON.parse(fs3__namespace.readFileSync(pkgPath, "utf-8"));
@@ -676,11 +699,11 @@ function parseEnvFile(filePath) {
   return result;
 }
 function resolveBaseUrl(frontendDir) {
-  const envLocal = parseEnvFile(path__namespace.join(frontendDir, ".env.local"));
+  const envLocal = parseEnvFile(path3__namespace.join(frontendDir, ".env.local"));
   if (envLocal.has("NEXT_PUBLIC_API_URL")) {
     return envLocal.get("NEXT_PUBLIC_API_URL");
   }
-  const env = parseEnvFile(path__namespace.join(frontendDir, ".env"));
+  const env = parseEnvFile(path3__namespace.join(frontendDir, ".env"));
   if (env.has("NEXT_PUBLIC_API_URL")) {
     return env.get("NEXT_PUBLIC_API_URL");
   }
@@ -691,16 +714,16 @@ function resolveBaseUrl(frontendDir) {
 }
 function resolveOutputDir(frontendDir, framework, outFlag) {
   if (outFlag) {
-    return path__namespace.resolve(frontendDir, outFlag);
+    return path3__namespace.resolve(frontendDir, outFlag);
   }
-  if (framework === "nextjs") {
-    const appDir = path__namespace.join(frontendDir, "app");
-    const srcDir = path__namespace.join(frontendDir, "src");
-    if (fs3__namespace.existsSync(appDir) && !fs3__namespace.existsSync(srcDir)) {
-      return path__namespace.resolve(frontendDir, "app");
-    }
+  const structure = detectProjectStructure(frontendDir);
+  if (structure.usesSrc) {
+    return path3__namespace.resolve(frontendDir, "src");
   }
-  return path__namespace.resolve(frontendDir, "src");
+  if (framework === "nextjs" && structure.usesAppRouter) {
+    return path3__namespace.resolve(frontendDir, "app");
+  }
+  return path3__namespace.resolve(frontendDir, "src");
 }
 var BASE_PACKAGES = [
   "@tanstack/react-query",
@@ -718,7 +741,7 @@ function checkDependencies(frontendDir, framework) {
     ...BASE_PACKAGES,
     ...FRAMEWORK_PACKAGES[framework] ?? []
   ];
-  const pkgPath = path__namespace.join(frontendDir, "package.json");
+  const pkgPath = path3__namespace.join(frontendDir, "package.json");
   let installed;
   try {
     const pkg = JSON.parse(fs3__namespace.readFileSync(pkgPath, "utf-8"));
@@ -1248,6 +1271,74 @@ function generateFormFile(config, modelConfig) {
   lines.push(``);
   return lines.join("\n");
 }
+
+// src/frontend/codegen/page.ts
+function generatePageFile(config, modelConfig) {
+  const { model } = modelConfig;
+  const { name } = model;
+  const modelLower = name.charAt(0).toLowerCase() + name.slice(1);
+  const pluralName = name + "s";
+  const lines = [];
+  lines.push(`'use client'`);
+  lines.push(``);
+  lines.push(`import { ${name}Table } from '@/components/${modelLower}/${name}Table'`);
+  lines.push(``);
+  lines.push(`export default function ${pluralName}Page() {`);
+  lines.push(`  return (`);
+  lines.push(`    <div className="container mx-auto py-10">`);
+  lines.push(`      <h1 className="text-3xl font-bold mb-6">${pluralName}</h1>`);
+  lines.push(`      <${name}Table />`);
+  lines.push(`    </div>`);
+  lines.push(`  )`);
+  lines.push(`}`);
+  lines.push(``);
+  return lines.join("\n");
+}
+
+// src/frontend/codegen/menu.ts
+function generateMenuData(config) {
+  const { models } = config;
+  const lines = [];
+  lines.push(`/**`);
+  lines.push(` * Auto-generated menu data for omni-rest CRUD pages`);
+  lines.push(` * Generated by omni-rest \u2014 do not edit manually.`);
+  lines.push(` * Re-run after schema changes.`);
+  lines.push(` */`);
+  lines.push(``);
+  lines.push(`export interface MenuItem {`);
+  lines.push(`  label: string;`);
+  lines.push(`  href: string;`);
+  lines.push(`  icon?: string;`);
+  lines.push(`}`);
+  lines.push(``);
+  lines.push(`export const omniRestMenuItems: MenuItem[] = [`);
+  for (const modelConfig of models) {
+    const { name } = modelConfig.model;
+    const pluralName = name + "s";
+    const route = `/${name.toLowerCase()}s`;
+    lines.push(`  {`);
+    lines.push(`    label: '${pluralName}',`);
+    lines.push(`    href: '${route}',`);
+    lines.push(`  },`);
+  }
+  lines.push(`];`);
+  lines.push(``);
+  lines.push(`/**`);
+  lines.push(` * Get a menu item by its label`);
+  lines.push(` */`);
+  lines.push(`export function getMenuItemByLabel(label: string): MenuItem | undefined {`);
+  lines.push(`  return omniRestMenuItems.find(item => item.label === label);`);
+  lines.push(`}`);
+  lines.push(``);
+  lines.push(`/**`);
+  lines.push(` * Get a menu item by its href`);
+  lines.push(` */`);
+  lines.push(`export function getMenuItemByHref(href: string): MenuItem | undefined {`);
+  lines.push(`  return omniRestMenuItems.find(item => item.href === href);`);
+  lines.push(`}`);
+  lines.push(``);
+  return lines.join("\n");
+}
 var GREEN = "\x1B[32m";
 var YELLOW = "\x1B[33m";
 var BLUE = "\x1B[34m";
@@ -1257,7 +1348,7 @@ async function writeFile(destPath, content) {
   let existed = false;
   try {
     existed = fs3__namespace.existsSync(destPath);
-    fs3__namespace.mkdirSync(path__namespace.dirname(destPath), { recursive: true });
+    fs3__namespace.mkdirSync(path3__namespace.dirname(destPath), { recursive: true });
     fs3__namespace.writeFileSync(destPath, content, "utf8");
     return { path: destPath, status: existed ? "overwritten" : "created" };
   } catch (err) {
@@ -1271,14 +1362,14 @@ var BASE_COMPONENTS = [
 async function copyBaseComponents(outputDir, packageRoot) {
   const results = [];
   for (const { src, dest } of BASE_COMPONENTS) {
-    const srcPath = path__namespace.join(packageRoot, src);
-    const destPath = path__namespace.join(outputDir, dest);
+    const srcPath = path3__namespace.join(packageRoot, src);
+    const destPath = path3__namespace.join(outputDir, dest);
     if (fs3__namespace.existsSync(destPath)) {
       results.push({ path: destPath, status: "skipped" });
       continue;
     }
     try {
-      fs3__namespace.mkdirSync(path__namespace.dirname(destPath), { recursive: true });
+      fs3__namespace.mkdirSync(path3__namespace.dirname(destPath), { recursive: true });
       fs3__namespace.copyFileSync(srcPath, destPath);
       results.push({ path: destPath, status: "created" });
     } catch (err) {
@@ -1327,27 +1418,42 @@ var COLORS = {
   bold: (s) => `\x1B[1m${s}\x1B[0m`
 };
 async function generateAll(config) {
-  const { outputDir, models } = config;
-  const packageRoot = path__namespace.resolve(__dirname, "..");
+  const { outputDir, models, framework, frontendDir } = config;
+  const generatePages = config.generatePages ?? framework === "nextjs";
+  const generateMenu = config.generateMenu ?? true;
+  const routeGroup = config.routeGroup ?? "autogenerated-omni";
+  const packageRoot = path3__namespace.resolve(__dirname, "..");
   const results = [];
+  const structure = detectProjectStructure(frontendDir);
   for (const modelConfig of models) {
     const { name } = modelConfig.model;
     const modelLower = name.charAt(0).toLowerCase() + name.slice(1);
     const hookContent = generateHookFile(config, modelConfig);
-    const hookPath = path__namespace.join(outputDir, "hooks", `use${name}.ts`);
+    const hookPath = path3__namespace.join(outputDir, "hooks", `use${name}.ts`);
     results.push(await writeFile(hookPath, hookContent));
     const columnsContent = generateColumnsFile(config, modelConfig);
-    const columnsPath = path__namespace.join(outputDir, "components", modelLower, `${name}Columns.tsx`);
+    const columnsPath = path3__namespace.join(outputDir, "components", modelLower, `${name}Columns.tsx`);
     results.push(await writeFile(columnsPath, columnsContent));
     const tableContent = generateTableFile(config, modelConfig);
-    const tablePath = path__namespace.join(outputDir, "components", modelLower, `${name}Table.tsx`);
+    const tablePath = path3__namespace.join(outputDir, "components", modelLower, `${name}Table.tsx`);
     results.push(await writeFile(tablePath, tableContent));
     const formContent = generateFormFile(config, modelConfig);
-    const formPath = path__namespace.join(outputDir, "components", modelLower, `${name}Form.tsx`);
+    const formPath = path3__namespace.join(outputDir, "components", modelLower, `${name}Form.tsx`);
     results.push(await writeFile(formPath, formContent));
+    if (generatePages && framework === "nextjs" && structure.usesAppRouter && structure.appPath) {
+      const pageContent = generatePageFile(config, modelConfig);
+      const pluralLower = name.toLowerCase() + "s";
+      const pagePath = path3__namespace.join(structure.appPath, `(${routeGroup})`, pluralLower, "page.tsx");
+      results.push(await writeFile(pagePath, pageContent));
+    }
   }
   const baseResults = await copyBaseComponents(outputDir, packageRoot);
   results.push(...baseResults);
+  if (generateMenu) {
+    const menuContent = generateMenuData(config);
+    const menuPath = path3__namespace.join(outputDir, "lib", "menu-data.ts");
+    results.push(await writeFile(menuPath, menuContent));
+  }
   printSummary(results);
   return results;
 }
@@ -1362,6 +1468,9 @@ var HELP_TEXT = `
     --autopilot             Skip all prompts, use defaults
     --no-bulk               Disable bulk delete hooks and wiring
     --no-optimistic         Disable optimistic update patterns
+    --no-pages              Disable Next.js page generation (default: enabled for Next.js)
+    --no-menu               Disable menu-data.ts generation (default: enabled)
+    --route-group <name>    Route group name for Next.js pages (default: autogenerated-omni)
     --stale-time <ms>       useQuery staleTime (default: 30000)
     --gc-time <ms>          useQuery gcTime (default: 300000)
     --steps <mode>          Multi-step form mode: auto | always | never (default: auto)
@@ -1384,6 +1493,9 @@ async function run(argv) {
   let autopilot = false;
   let noBulk = false;
   let noOptimistic = false;
+  let generatePages = true;
+  let generateMenu = true;
+  let routeGroup = "autogenerated-omni";
   let staleTime = 3e4;
   let gcTime = 3e5;
   let stepsFlag = "auto";
@@ -1414,6 +1526,15 @@ async function run(argv) {
       case "--no-optimistic":
         noOptimistic = true;
         break;
+      case "--no-pages":
+        generatePages = false;
+        break;
+      case "--no-menu":
+        generateMenu = false;
+        break;
+      case "--route-group":
+        routeGroup = argv[++i];
+        break;
       case "--stale-time":
         staleTime = parseInt(argv[++i], 10) || 3e4;
         break;
@@ -1538,13 +1659,18 @@ async function run(argv) {
   };
   const modelConfigs = await buildConfig(allModels, flags);
   const generatorConfig = {
+    frontendDir,
     framework,
     baseUrl,
     outputDir,
     models: modelConfigs,
     staleTime,
     gcTime,
-    noOptimistic};
+    noOptimistic,
+    generatePages,
+    generateMenu,
+    routeGroup
+  };
   await generateAll(generatorConfig);
   console.log(COLORS.bold("\n  Done!\n"));
 }
@@ -1562,8 +1688,8 @@ var COLORS2 = {
   bold: (s) => `\x1B[1m${s}\x1B[0m`
 };
 function write(filePath, content) {
-  const abs = path__namespace.default.resolve(cwd, filePath);
-  fs3__namespace.default.mkdirSync(path__namespace.default.dirname(abs), { recursive: true });
+  const abs = path3__namespace.default.resolve(cwd, filePath);
+  fs3__namespace.default.mkdirSync(path3__namespace.default.dirname(abs), { recursive: true });
   fs3__namespace.default.writeFileSync(abs, content, "utf-8");
   console.log(COLORS2.green(`  \u2713 Written: ${filePath}`));
 }
@@ -1588,8 +1714,8 @@ function createPrismaClient() {
 }
 function tryLoadFromSchemaOutput() {
   const schemaPaths = [
-    path__namespace.default.resolve(cwd, "prisma/schema.prisma"),
-    path__namespace.default.resolve(cwd, "schema.prisma")
+    path3__namespace.default.resolve(cwd, "prisma/schema.prisma"),
+    path3__namespace.default.resolve(cwd, "schema.prisma")
   ];
   for (const schemaPath of schemaPaths) {
     if (!fs3__namespace.default.existsSync(schemaPath)) continue;
@@ -1597,8 +1723,8 @@ function tryLoadFromSchemaOutput() {
       const schema = fs3__namespace.default.readFileSync(schemaPath, "utf-8");
       const match = schema.match(/output\s*=\s*["']([^"']+)["']/);
       if (!match) continue;
-      const outputDir = path__namespace.default.resolve(path__namespace.default.dirname(schemaPath), match[1]);
-      const indexPath = path__namespace.default.join(outputDir, "index.js");
+      const outputDir = path3__namespace.default.resolve(path3__namespace.default.dirname(schemaPath), match[1]);
+      const indexPath = path3__namespace.default.join(outputDir, "index.js");
       const result = extractRuntimeDataModelFromFile(indexPath);
       if (result) return result;
     } catch {
@@ -1609,8 +1735,8 @@ function tryLoadFromSchemaOutput() {
 }
 function tryLoadFromStandardOutput() {
   const candidates = [
-    path__namespace.default.resolve(cwd, "node_modules/.prisma/client/index.js"),
-    path__namespace.default.resolve(cwd, "node_modules/@prisma/client/index.js")
+    path3__namespace.default.resolve(cwd, "node_modules/.prisma/client/index.js"),
+    path3__namespace.default.resolve(cwd, "node_modules/@prisma/client/index.js")
   ];
   for (const clientPath of candidates) {
     const result = extractRuntimeDataModelFromFile(clientPath);
@@ -1707,7 +1833,7 @@ async function run2() {
 function getPackageName() {
   try {
     const pkg = JSON.parse(
-      fs3__namespace.default.readFileSync(path__namespace.default.resolve(cwd, "package.json"), "utf-8")
+      fs3__namespace.default.readFileSync(path3__namespace.default.resolve(cwd, "package.json"), "utf-8")
     );
     return pkg.name ?? "My API";
   } catch {
@@ -1717,7 +1843,7 @@ function getPackageName() {
 function getPackageVersion() {
   try {
     const pkg = JSON.parse(
-      fs3__namespace.default.readFileSync(path__namespace.default.resolve(cwd, "package.json"), "utf-8")
+      fs3__namespace.default.readFileSync(path3__namespace.default.resolve(cwd, "package.json"), "utf-8")
     );
     return pkg.version ?? "1.0.0";
   } catch {