arri 0.0.20 → 0.0.22

package/dist/chunks/index.cjs

@@ -42,7 +42,7 @@ require('@sinclair/typebox/errors');
 require('@sinclair/typebox/value');
 require('../index.cjs');
 require('ofetch');
-require('../shared/arri.234caf5e.cjs');
+require('../shared/arri.12a51234.cjs');
 require('child_process');
 require('listhen');
 

package/dist/chunks/index.mjs

@@ -40,7 +40,7 @@ import '@sinclair/typebox/errors';
 import '@sinclair/typebox/value';
 import '../index.mjs';
 import 'ofetch';
-import '../shared/arri.c6b92822.mjs';
+import '../shared/arri.6966fa30.mjs';
 import 'child_process';
 import 'listhen';
 

package/dist/cli.cjs

@@ -33,7 +33,7 @@ require('@sinclair/typebox');
 require('h3');
 require('@sinclair/typebox/errors');
 require('@sinclair/typebox/value');
-const dart = require('./shared/arri.234caf5e.cjs');
+const dart = require('./shared/arri.12a51234.cjs');
 const listhen = require('listhen');
 require('child_process');
 
@@ -19823,11 +19823,15 @@ async function setupWorkingDir(config) {
 }
 async function createRoutesModule(config) {
   const routes = [];
+  const existingRoutes = [];
   await Promise.all(
     config.procedureGlobPatterns.map(async (pattern) => {
       const results = await getVirtualRouteBatch(pattern, config);
       for (const result of results) {
-        routes.push(result);
+        if (!existingRoutes.includes(result.name)) {
+          routes.push(result);
+          existingRoutes.push(result.name);
+        }
       }
     })
   );
@@ -19836,7 +19840,7 @@ async function createRoutesModule(config) {
     `${routes.map(
       (route) => `import ${route.importName} from '${route.importPath}';`
     ).join("\n")}
-        const routes: { id: string; route: any }[] = [${routes.map(
+        const routes = [${routes.map(
       (route) => `{ id: '${route.name}', route: ${route.importName} }`
     ).join(",\n")}
         ];
@@ -19844,7 +19848,7 @@ async function createRoutesModule(config) {
     { parser: "typescript", tabWidth: 4 }
   );
   await fs__default$1.writeFile(
-    path__default$1.resolve(config.rootDir, config.buildDir, "routes.ts"),
+    path__default$1.resolve(config.rootDir, config.buildDir, "routes.js"),
     module
   );
 }
@@ -19860,8 +19864,9 @@ async function getVirtualRouteBatch(globPattern, config) {
   for (const file of files) {
     const meta = getRpcMetaFromPath(config, file);
     if (meta) {
-      const importParts = path__default$1.relative(path__default$1.resolve(config.rootDir, config.buildDir), file).split(".");
+      const importParts = path__default$1.relative(path__default$1.resolve(config.rootDir, config.srcDir), file).split(".");
       importParts.pop();
+      importParts.push("js");
       routes.push({
         name: meta.id,
         importName: app.camelCase(meta.id.split(".").join("_")),
@@ -19905,6 +19910,25 @@ const getRpcMetaFromPath = (config, filePath) => {
     httpPath: `/${httpParts.join("/")}`
   };
 };
+async function transpileFiles(config) {
+  const outDir = path__default$1.resolve(config.rootDir, config.buildDir);
+  const files = await globby(["**/*.ts"], {
+    cwd: path__default$1.resolve(config.rootDir, config.srcDir)
+  });
+  await esbuild.build({
+    ...config.esbuild,
+    entryPoints: [
+      ...files.map(
+        (file) => path__default$1.resolve(config.rootDir, config.srcDir, file)
+      )
+    ],
+    outdir: outDir,
+    bundle: false,
+    format: "esm",
+    target: "node18",
+    platform: "node"
+  });
+}
 
 const build = citty.defineCommand({
   args: {
@@ -19937,14 +19961,19 @@ async function startBuild(config) {
   logger$1.log("Bundling server....");
   await setupWorkingDir(config);
   await Promise.all([
+    transpileFiles(config),
     createRoutesModule(config),
     createBuildEntryModule(config),
     createBuildCodegenModule(config)
   ]);
-  await bundleFiles$1(config);
+  await bundleFiles(config);
   logger$1.log("Finished bundling");
   const clientCount = config.clientGenerators.length;
-  const codegenModule = path__default$1.resolve(config.rootDir, ".output", "codegen.js");
+  const codegenModule = path__default$1.resolve(
+    config.rootDir,
+    config.buildDir,
+    "codegen.js"
+  );
   if (clientCount > 0) {
     logger$1.log("Generating clients");
     node_child_process.execSync(`node ${codegenModule}`);
@@ -19969,27 +19998,32 @@ async function startBuild(config) {
     `Build finished! You can start your server by running "node .output/server.js"`
   );
 }
-async function bundleFiles$1(config) {
+async function bundleFiles(config) {
   await esbuild.build({
     ...config.esbuild,
     entryPoints: [
-      path__default$1.resolve(config.rootDir, config.buildDir, "server.ts"),
-      path__default$1.resolve(config.rootDir, config.buildDir, "codegen.ts")
+      path__default$1.resolve(config.rootDir, config.buildDir, "server.js")
     ],
     platform: config.esbuild.platform ?? "node",
     target: config.esbuild.target ?? "node18",
     bundle: true,
+    format: "esm",
+    sourcemap: true,
+    minifyWhitespace: true,
+    banner: {
+      js: "import { createRequire as topLevelCreateRequire } from 'module';\n const require = topLevelCreateRequire(import.meta.url);"
+    },
     outdir: path__default$1.resolve(config.rootDir, ".output")
   });
 }
 async function createBuildEntryModule(config) {
   const appModule = path__default$1.resolve(config.rootDir, config.srcDir, config.entry);
-  const appImportParts = path__default$1.relative(path__default$1.resolve(config.rootDir, config.buildDir), appModule).split(".");
+  const appImportParts = path__default$1.relative(path__default$1.resolve(config.rootDir, config.srcDir), appModule).split(".");
   appImportParts.pop();
   const virtualEntry = `import { toNodeListener } from 'h3';
 import { listen } from 'listhen';
-import routes from './routes';
-import app from './${appImportParts.join(".")}';
+import routes from './routes.js';
+import app from './${appImportParts.join(".")}.js';
 
 for (const route of routes) {
     app.registerRpc(route.id, route.route);
@@ -19999,29 +20033,35 @@ void listen(toNodeListener(app.getH3Instance()), {
     port: process.env.PORT ?? ${config.port},
 });`;
   await fs__default$1.writeFile(
-    path__default$1.resolve(config.rootDir, config.buildDir, "server.ts"),
+    path__default$1.resolve(config.rootDir, config.buildDir, "server.js"),
     virtualEntry
   );
 }
 async function createBuildCodegenModule(config) {
   const appModule = path__default$1.resolve(config.rootDir, config.srcDir, config.entry);
-  const appImportParts = path__default$1.relative(path__default$1.resolve(config.rootDir, config.buildDir), appModule).split(".");
+  const appImportParts = path__default$1.relative(path__default$1.resolve(config.rootDir, config.srcDir), appModule).split(".");
   appImportParts.pop();
   const virtualModule = await prettier__default.format(
     `
     import { writeFileSync } from 'node:fs';
     import path from 'pathe';
-    import app from './${appImportParts.join(".")}';
+    import app from './${appImportParts.join(".")}.js';
+    import routes from './routes.js';
+
+    for(const route of routes) {
+        app.registerRpc(route.id, route.route);
+    }
 
+    const __dirname = new URL(".", import.meta.url).pathname;
     const def = app.getAppDefinition();
     writeFileSync(
-        path.resolve(__dirname, "__definition.json"),
+        path.resolve(__dirname, "../.output", "__definition.json"),
         JSON.stringify(def),
     );`,
     { tabWidth: 4, parser: "typescript" }
   );
   await fs__default$1.writeFile(
-    path__default$1.resolve(config.rootDir, config.buildDir, "codegen.ts"),
+    path__default$1.resolve(config.rootDir, config.buildDir, "codegen.js"),
     virtualModule
   );
 }
@@ -20113,8 +20153,7 @@ const dev = citty.defineCommand({
   async run({ args }) {
     process.env.ARRI_DEV_MODE = "true";
     const config = await loadConfig({
-      configFile: path__default$1.resolve(args.config),
-      defaultConfig: index.defaultConfig
+      configFile: path__default$1.resolve(args.config)
     });
     if (!config) {
       throw new Error("Unable to find config");
@@ -20122,20 +20161,7 @@ const dev = citty.defineCommand({
     await startDevServer(config.config);
   }
 });
-async function bundleFiles(config) {
-  const outDir = path__default$1.resolve(config.rootDir, ".output");
-  await esbuild.build({
-    ...config.esbuild,
-    entryPoints: [
-      path__default$1.resolve(config.rootDir, config.buildDir, "entry.ts")
-    ],
-    outdir: outDir,
-    bundle: true,
-    target: "node18",
-    platform: "node"
-  });
-}
-const startListener = (config, showQr = false) => listhen.listenAndWatch(path__default$1.resolve(config.rootDir, ".output", "entry.js"), {
+const startListener = (config, showQr = false) => listhen.listenAndWatch(path__default$1.resolve(config.rootDir, config.buildDir, "entry.js"), {
   public: true,
   port: config.port,
   logger,
@@ -20145,8 +20171,8 @@ async function startDevServer(config) {
   await setupWorkingDir(config);
   let fileWatcher;
   await Promise.all([createRoutesModule(config), createEntryModule(config)]);
-  await bundleFiles(config);
-  let listener = await startListener(config, true);
+  await transpileFiles(config);
+  await startListener(config, true);
   setTimeout(async () => {
     await generateClients(config);
   }, 1e3);
@@ -20166,15 +20192,14 @@ async function startDevServer(config) {
         ignoreInitial: true
       });
       fileWatcher.on("all", async (_event, file) => {
+        await transpileFiles(config);
         await createRoutesModule(config);
         let bundleCreated = false;
         try {
           logger.log(
             "Change detected. Bundling files and restarting server...."
           );
-          await bundleFiles(config);
-          await listener.close();
-          listener = await startListener(config);
+          await transpileFiles(config);
           bundleCreated = true;
         } catch (err) {
           logger.error(err);
@@ -20216,7 +20241,7 @@ async function generateClients(config) {
 }
 async function createEntryModule(config) {
   const appModule = path__default$1.resolve(config.rootDir, config.srcDir, config.entry);
-  const appImportParts = path__default$1.relative(path__default$1.resolve(config.rootDir, config.buildDir), appModule).split(".");
+  const appImportParts = path__default$1.relative(path__default$1.resolve(config.rootDir, config.srcDir), appModule).split(".");
   appImportParts.pop();
   const virtualEntry = `import { toNodeListener } from 'h3';
 import { listen } from 'listhen';
@@ -20229,7 +20254,7 @@ for (const route of routes) {
 
 export default app.getH3Instance();`;
   await fs__default$1.writeFile(
-    path__default$1.resolve(config.rootDir, config.buildDir, "entry.ts"),
+    path__default$1.resolve(config.rootDir, config.buildDir, "entry.js"),
     virtualEntry
   );
 }

package/dist/cli.mjs

@@ -31,7 +31,7 @@ import '@sinclair/typebox';
 import 'h3';
 import '@sinclair/typebox/errors';
 import '@sinclair/typebox/value';
-import { a as dartClientGenerator } from './shared/arri.c6b92822.mjs';
+import { a as dartClientGenerator } from './shared/arri.6966fa30.mjs';
 import { listenAndWatch } from 'listhen';
 import 'child_process';
 
@@ -19802,11 +19802,15 @@ async function setupWorkingDir(config) {
 }
 async function createRoutesModule(config) {
   const routes = [];
+  const existingRoutes = [];
   await Promise.all(
     config.procedureGlobPatterns.map(async (pattern) => {
       const results = await getVirtualRouteBatch(pattern, config);
       for (const result of results) {
-        routes.push(result);
+        if (!existingRoutes.includes(result.name)) {
+          routes.push(result);
+          existingRoutes.push(result.name);
+        }
       }
     })
   );
@@ -19815,7 +19819,7 @@ async function createRoutesModule(config) {
     `${routes.map(
       (route) => `import ${route.importName} from '${route.importPath}';`
     ).join("\n")}
-        const routes: { id: string; route: any }[] = [${routes.map(
+        const routes = [${routes.map(
       (route) => `{ id: '${route.name}', route: ${route.importName} }`
     ).join(",\n")}
         ];
@@ -19823,7 +19827,7 @@ async function createRoutesModule(config) {
     { parser: "typescript", tabWidth: 4 }
   );
   await fs$f.writeFile(
-    path$e.resolve(config.rootDir, config.buildDir, "routes.ts"),
+    path$e.resolve(config.rootDir, config.buildDir, "routes.js"),
     module
   );
 }
@@ -19839,8 +19843,9 @@ async function getVirtualRouteBatch(globPattern, config) {
   for (const file of files) {
     const meta = getRpcMetaFromPath(config, file);
     if (meta) {
-      const importParts = path$e.relative(path$e.resolve(config.rootDir, config.buildDir), file).split(".");
+      const importParts = path$e.relative(path$e.resolve(config.rootDir, config.srcDir), file).split(".");
       importParts.pop();
+      importParts.push("js");
       routes.push({
         name: meta.id,
         importName: camelCase(meta.id.split(".").join("_")),
@@ -19884,6 +19889,25 @@ const getRpcMetaFromPath = (config, filePath) => {
     httpPath: `/${httpParts.join("/")}`
   };
 };
+async function transpileFiles(config) {
+  const outDir = path$e.resolve(config.rootDir, config.buildDir);
+  const files = await globby(["**/*.ts"], {
+    cwd: path$e.resolve(config.rootDir, config.srcDir)
+  });
+  await build$1({
+    ...config.esbuild,
+    entryPoints: [
+      ...files.map(
+        (file) => path$e.resolve(config.rootDir, config.srcDir, file)
+      )
+    ],
+    outdir: outDir,
+    bundle: false,
+    format: "esm",
+    target: "node18",
+    platform: "node"
+  });
+}
 
 const build = defineCommand({
   args: {
@@ -19916,14 +19940,19 @@ async function startBuild(config) {
   logger$1.log("Bundling server....");
   await setupWorkingDir(config);
   await Promise.all([
+    transpileFiles(config),
     createRoutesModule(config),
     createBuildEntryModule(config),
     createBuildCodegenModule(config)
   ]);
-  await bundleFiles$1(config);
+  await bundleFiles(config);
   logger$1.log("Finished bundling");
   const clientCount = config.clientGenerators.length;
-  const codegenModule = path$e.resolve(config.rootDir, ".output", "codegen.js");
+  const codegenModule = path$e.resolve(
+    config.rootDir,
+    config.buildDir,
+    "codegen.js"
+  );
   if (clientCount > 0) {
     logger$1.log("Generating clients");
     execSync(`node ${codegenModule}`);
@@ -19948,27 +19977,32 @@ async function startBuild(config) {
     `Build finished! You can start your server by running "node .output/server.js"`
   );
 }
-async function bundleFiles$1(config) {
+async function bundleFiles(config) {
   await build$1({
     ...config.esbuild,
     entryPoints: [
-      path$e.resolve(config.rootDir, config.buildDir, "server.ts"),
-      path$e.resolve(config.rootDir, config.buildDir, "codegen.ts")
+      path$e.resolve(config.rootDir, config.buildDir, "server.js")
     ],
     platform: config.esbuild.platform ?? "node",
     target: config.esbuild.target ?? "node18",
     bundle: true,
+    format: "esm",
+    sourcemap: true,
+    minifyWhitespace: true,
+    banner: {
+      js: "import { createRequire as topLevelCreateRequire } from 'module';\n const require = topLevelCreateRequire(import.meta.url);"
+    },
     outdir: path$e.resolve(config.rootDir, ".output")
   });
 }
 async function createBuildEntryModule(config) {
   const appModule = path$e.resolve(config.rootDir, config.srcDir, config.entry);
-  const appImportParts = path$e.relative(path$e.resolve(config.rootDir, config.buildDir), appModule).split(".");
+  const appImportParts = path$e.relative(path$e.resolve(config.rootDir, config.srcDir), appModule).split(".");
   appImportParts.pop();
   const virtualEntry = `import { toNodeListener } from 'h3';
 import { listen } from 'listhen';
-import routes from './routes';
-import app from './${appImportParts.join(".")}';
+import routes from './routes.js';
+import app from './${appImportParts.join(".")}.js';
 
 for (const route of routes) {
     app.registerRpc(route.id, route.route);
@@ -19978,29 +20012,35 @@ void listen(toNodeListener(app.getH3Instance()), {
     port: process.env.PORT ?? ${config.port},
 });`;
   await fs$f.writeFile(
-    path$e.resolve(config.rootDir, config.buildDir, "server.ts"),
+    path$e.resolve(config.rootDir, config.buildDir, "server.js"),
     virtualEntry
   );
 }
 async function createBuildCodegenModule(config) {
   const appModule = path$e.resolve(config.rootDir, config.srcDir, config.entry);
-  const appImportParts = path$e.relative(path$e.resolve(config.rootDir, config.buildDir), appModule).split(".");
+  const appImportParts = path$e.relative(path$e.resolve(config.rootDir, config.srcDir), appModule).split(".");
   appImportParts.pop();
   const virtualModule = await prettier.format(
     `
     import { writeFileSync } from 'node:fs';
     import path from 'pathe';
-    import app from './${appImportParts.join(".")}';
+    import app from './${appImportParts.join(".")}.js';
+    import routes from './routes.js';
+
+    for(const route of routes) {
+        app.registerRpc(route.id, route.route);
+    }
 
+    const __dirname = new URL(".", import.meta.url).pathname;
     const def = app.getAppDefinition();
     writeFileSync(
-        path.resolve(__dirname, "__definition.json"),
+        path.resolve(__dirname, "../.output", "__definition.json"),
         JSON.stringify(def),
     );`,
     { tabWidth: 4, parser: "typescript" }
   );
   await fs$f.writeFile(
-    path$e.resolve(config.rootDir, config.buildDir, "codegen.ts"),
+    path$e.resolve(config.rootDir, config.buildDir, "codegen.js"),
     virtualModule
   );
 }
@@ -20092,8 +20132,7 @@ const dev = defineCommand({
   async run({ args }) {
     process.env.ARRI_DEV_MODE = "true";
     const config = await loadConfig({
-      configFile: path$e.resolve(args.config),
-      defaultConfig
+      configFile: path$e.resolve(args.config)
     });
     if (!config) {
       throw new Error("Unable to find config");
@@ -20101,20 +20140,7 @@ const dev = defineCommand({
     await startDevServer(config.config);
   }
 });
-async function bundleFiles(config) {
-  const outDir = path$e.resolve(config.rootDir, ".output");
-  await build$1({
-    ...config.esbuild,
-    entryPoints: [
-      path$e.resolve(config.rootDir, config.buildDir, "entry.ts")
-    ],
-    outdir: outDir,
-    bundle: true,
-    target: "node18",
-    platform: "node"
-  });
-}
-const startListener = (config, showQr = false) => listenAndWatch(path$e.resolve(config.rootDir, ".output", "entry.js"), {
+const startListener = (config, showQr = false) => listenAndWatch(path$e.resolve(config.rootDir, config.buildDir, "entry.js"), {
   public: true,
   port: config.port,
   logger,
@@ -20124,8 +20150,8 @@ async function startDevServer(config) {
   await setupWorkingDir(config);
   let fileWatcher;
   await Promise.all([createRoutesModule(config), createEntryModule(config)]);
-  await bundleFiles(config);
-  let listener = await startListener(config, true);
+  await transpileFiles(config);
+  await startListener(config, true);
   setTimeout(async () => {
     await generateClients(config);
   }, 1e3);
@@ -20145,15 +20171,14 @@ async function startDevServer(config) {
         ignoreInitial: true
       });
       fileWatcher.on("all", async (_event, file) => {
+        await transpileFiles(config);
         await createRoutesModule(config);
         let bundleCreated = false;
         try {
           logger.log(
             "Change detected. Bundling files and restarting server...."
           );
-          await bundleFiles(config);
-          await listener.close();
-          listener = await startListener(config);
+          await transpileFiles(config);
           bundleCreated = true;
         } catch (err) {
           logger.error(err);
@@ -20195,7 +20220,7 @@ async function generateClients(config) {
 }
 async function createEntryModule(config) {
   const appModule = path$e.resolve(config.rootDir, config.srcDir, config.entry);
-  const appImportParts = path$e.relative(path$e.resolve(config.rootDir, config.buildDir), appModule).split(".");
+  const appImportParts = path$e.relative(path$e.resolve(config.rootDir, config.srcDir), appModule).split(".");
   appImportParts.pop();
   const virtualEntry = `import { toNodeListener } from 'h3';
 import { listen } from 'listhen';
@@ -20208,7 +20233,7 @@ for (const route of routes) {
 
 export default app.getH3Instance();`;
   await fs$f.writeFile(
-    path$e.resolve(config.rootDir, config.buildDir, "entry.ts"),
+    path$e.resolve(config.rootDir, config.buildDir, "entry.js"),
     virtualEntry
   );
 }

package/dist/codegen.cjs

@@ -3,7 +3,7 @@
 const require$$0 = require('fs');
 const prettier = require('prettier');
 const app = require('./shared/arri.38792eb4.cjs');
-const dart = require('./shared/arri.234caf5e.cjs');
+const dart = require('./shared/arri.12a51234.cjs');
 require('@sinclair/typebox');
 require('h3');
 require('@sinclair/typebox/errors');
@@ -20,6 +20,11 @@ const typescriptClientGenerator = dart.defineClientGeneratorPlugin(
       if (!options.outputFile) {
         throw new Error("No output file specified");
       }
+      if (Object.keys(def.procedures).length <= 0) {
+        throw new Error(
+          "No procedures found in definition file. Typescript client will not be generated."
+        );
+      }
       const result = await createTypescriptClient(
         def,
         options.clientName

package/dist/codegen.mjs

@@ -2,8 +2,8 @@ import { writeFileSync } from 'fs';
 import { format } from 'prettier';
 import { u as unflattenObject, i as isServiceDef, p as pascalCase, a as isProcedureDef, b as isJsonSchemaScalarType, c as isJsonSchemaNullType, d as isJsonSchemaObject, e as isJsonSchemaEnum, f as isJsonSchemaArray, g as unflattenProcedures, h as camelCase } from './shared/arri.e547206a.mjs';
 export { l as JsonSchemaComplexTypeValues, k as JsonSchemaNullTypeValues, J as JsonSchemaScalarTypeValues, j as isApplicationDef, n as normalizeWhitespace, r as removeDisallowedChars, s as setNestedObjectProperty } from './shared/arri.e547206a.mjs';
-import { d as defineClientGeneratorPlugin } from './shared/arri.c6b92822.mjs';
-export { j as classListTransformer, i as classTransformer, c as createDartClient, a as dartClientGenerator, f as dartModelFromJsonSchema, h as dartParsedJsonField, e as dartProcedureFromServiceDefinition, g as dartPropertyTypeFromSchema, b as dartServiceFromServiceDefinition, k as isDartType, l as isDartTypeWithNullables, t as transformers } from './shared/arri.c6b92822.mjs';
+import { d as defineClientGeneratorPlugin } from './shared/arri.6966fa30.mjs';
+export { j as classListTransformer, i as classTransformer, c as createDartClient, a as dartClientGenerator, f as dartModelFromJsonSchema, h as dartParsedJsonField, e as dartProcedureFromServiceDefinition, g as dartPropertyTypeFromSchema, b as dartServiceFromServiceDefinition, k as isDartType, l as isDartTypeWithNullables, t as transformers } from './shared/arri.6966fa30.mjs';
 import '@sinclair/typebox';
 import 'h3';
 import '@sinclair/typebox/errors';
@@ -20,6 +20,11 @@ const typescriptClientGenerator = defineClientGeneratorPlugin(
       if (!options.outputFile) {
         throw new Error("No output file specified");
       }
+      if (Object.keys(def.procedures).length <= 0) {
+        throw new Error(
+          "No procedures found in definition file. Typescript client will not be generated."
+        );
+      }
       const result = await createTypescriptClient(
         def,
         options.clientName

package/dist/shared/{arri.234caf5e.cjs → arri.12a51234.cjs}

@@ -22,6 +22,13 @@ const dartClientGenerator = defineClientGeneratorPlugin(
             'Missing "outputFile" cannot generate dart client'
           );
         }
+        const numProcedures = Object.keys(def.procedures).length;
+        if (numProcedures <= 0) {
+          console.warn(
+            "No procedures found in definition file. Dart client will not be generated"
+          );
+          return;
+        }
         const result = createDartClient(def, {
           clientName: options.clientName
         });
@@ -448,14 +455,32 @@ function dartParsedJsonField(fieldName, jsonKey, dartType) {
           jsonKey,
           "false"
         );
+      case "bool?":
+        return transformers.bool.fromJsonBody(
+          fieldName,
+          jsonKey,
+          "null"
+        );
       case "double":
         return transformers.double.fromJsonBody(
           fieldName,
           jsonKey,
           "0.0"
         );
+      case "double?":
+        return transformers.double.fromJsonBody(
+          fieldName,
+          jsonKey,
+          "null"
+        );
       case "int":
         return transformers.int.fromJsonBody(fieldName, jsonKey, "0");
+      case "int?":
+        return transformers.int.fromJsonBody(
+          fieldName,
+          jsonKey,
+          "null"
+        );
       case "null":
         return transformers.null.fromJsonBody(fieldName, jsonKey, "");
       case "DateTime":
@@ -524,11 +549,11 @@ const transformers = {
     toJsonBody: defaultToJsonBody
   },
   int: {
-    fromJsonBody: (key, jsonKey, fallback) => defaultFromJsonBody(key, jsonKey, "int", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => fallback === "null" ? `${key}: nullableIntFromDynamic(json["${jsonKey}"])` : `${key}: intFromDynamic(json["${jsonKey}"], ${fallback})`,
     toJsonBody: defaultToJsonBody
   },
   double: {
-    fromJsonBody: (key, jsonKey, fallback) => defaultFromJsonBody(key, jsonKey, "double", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => fallback === "null" ? `${key}: nullableDoubleFromDynamic(json["${jsonKey}"])` : `${key}: doubleFromDynamic(json["${jsonKey}"], ${fallback})`,
     toJsonBody: defaultToJsonBody
   },
   String: {
@@ -540,7 +565,7 @@ const transformers = {
     toJsonBody: defaultToJsonBody
   },
   DateTime: {
-    fromJsonBody: (key, jsonKey, fallback) => `${key}: json["${jsonKey}"] is String ? DateTime.parse(json["${jsonKey}"]) : ${fallback}`,
+    fromJsonBody: (key, jsonKey, fallback) => fallback === "null" ? `${key}: nullableDateTimeFromDynamic(json["${jsonKey}"])` : `${key}: dateTimeFromDynamic(json["${jsonKey}"], ${fallback})`,
     toJsonBody: (key, jsonKey, isNullable) => `"${jsonKey}": ${key}${isNullable ? "?" : ""}.toIso8601String()`
   },
   "List<null>": {
@@ -579,7 +604,10 @@ const transformers = {
   }
 };
 function defaultFromJsonBody(key, jsonKey, typename, fallback) {
-  return `${key}: json["${jsonKey}"] is ${typename} ? json["${jsonKey}"] : ${fallback}`;
+  if (fallback === "null") {
+    return `${key}: nullableTypeFromDynamic<${typename}>(json["${jsonKey}"])`;
+  }
+  return `${key}: typeFromDynamic<${typename}>(json["${jsonKey}"], ${fallback})`;
 }
 function defaultListFromJsonBody(key, jsonKey, typename, fallback) {
   return `${key}: json["${jsonKey}"] is List<${typename}> ? json["${jsonKey}"] : ${fallback}`;
@@ -604,7 +632,7 @@ const classTransformer = (typename, nullable) => {
 const classListTransformer = (typename) => {
   return {
     fromJsonBody: (key, jsonKey, fallback) => {
-      return `${key}: json["${jsonKey}"] is List<Map<String, dynamic>> ? 
+      return `${key}: json["${jsonKey}"] is List ? 
                 (json["${jsonKey}"] as List<Map<String, dynamic>>)
                     .map((val) => ${typename}.fromJson(val)).toList() : ${fallback}`;
     },

package/dist/shared/{arri.c6b92822.mjs → arri.6966fa30.mjs}

@@ -20,6 +20,13 @@ const dartClientGenerator = defineClientGeneratorPlugin(
             'Missing "outputFile" cannot generate dart client'
           );
         }
+        const numProcedures = Object.keys(def.procedures).length;
+        if (numProcedures <= 0) {
+          console.warn(
+            "No procedures found in definition file. Dart client will not be generated"
+          );
+          return;
+        }
         const result = createDartClient(def, {
           clientName: options.clientName
         });
@@ -446,14 +453,32 @@ function dartParsedJsonField(fieldName, jsonKey, dartType) {
           jsonKey,
           "false"
         );
+      case "bool?":
+        return transformers.bool.fromJsonBody(
+          fieldName,
+          jsonKey,
+          "null"
+        );
       case "double":
         return transformers.double.fromJsonBody(
           fieldName,
           jsonKey,
           "0.0"
         );
+      case "double?":
+        return transformers.double.fromJsonBody(
+          fieldName,
+          jsonKey,
+          "null"
+        );
       case "int":
         return transformers.int.fromJsonBody(fieldName, jsonKey, "0");
+      case "int?":
+        return transformers.int.fromJsonBody(
+          fieldName,
+          jsonKey,
+          "null"
+        );
       case "null":
         return transformers.null.fromJsonBody(fieldName, jsonKey, "");
       case "DateTime":
@@ -522,11 +547,11 @@ const transformers = {
     toJsonBody: defaultToJsonBody
   },
   int: {
-    fromJsonBody: (key, jsonKey, fallback) => defaultFromJsonBody(key, jsonKey, "int", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => fallback === "null" ? `${key}: nullableIntFromDynamic(json["${jsonKey}"])` : `${key}: intFromDynamic(json["${jsonKey}"], ${fallback})`,
     toJsonBody: defaultToJsonBody
   },
   double: {
-    fromJsonBody: (key, jsonKey, fallback) => defaultFromJsonBody(key, jsonKey, "double", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => fallback === "null" ? `${key}: nullableDoubleFromDynamic(json["${jsonKey}"])` : `${key}: doubleFromDynamic(json["${jsonKey}"], ${fallback})`,
     toJsonBody: defaultToJsonBody
   },
   String: {
@@ -538,7 +563,7 @@ const transformers = {
     toJsonBody: defaultToJsonBody
   },
   DateTime: {
-    fromJsonBody: (key, jsonKey, fallback) => `${key}: json["${jsonKey}"] is String ? DateTime.parse(json["${jsonKey}"]) : ${fallback}`,
+    fromJsonBody: (key, jsonKey, fallback) => fallback === "null" ? `${key}: nullableDateTimeFromDynamic(json["${jsonKey}"])` : `${key}: dateTimeFromDynamic(json["${jsonKey}"], ${fallback})`,
     toJsonBody: (key, jsonKey, isNullable) => `"${jsonKey}": ${key}${isNullable ? "?" : ""}.toIso8601String()`
   },
   "List<null>": {
@@ -577,7 +602,10 @@ const transformers = {
   }
 };
 function defaultFromJsonBody(key, jsonKey, typename, fallback) {
-  return `${key}: json["${jsonKey}"] is ${typename} ? json["${jsonKey}"] : ${fallback}`;
+  if (fallback === "null") {
+    return `${key}: nullableTypeFromDynamic<${typename}>(json["${jsonKey}"])`;
+  }
+  return `${key}: typeFromDynamic<${typename}>(json["${jsonKey}"], ${fallback})`;
 }
 function defaultListFromJsonBody(key, jsonKey, typename, fallback) {
   return `${key}: json["${jsonKey}"] is List<${typename}> ? json["${jsonKey}"] : ${fallback}`;
@@ -602,7 +630,7 @@ const classTransformer = (typename, nullable) => {
 const classListTransformer = (typename) => {
   return {
     fromJsonBody: (key, jsonKey, fallback) => {
-      return `${key}: json["${jsonKey}"] is List<Map<String, dynamic>> ? 
+      return `${key}: json["${jsonKey}"] is List ? 
                 (json["${jsonKey}"] as List<Map<String, dynamic>>)
                     .map((val) => ${typename}.fromJson(val)).toList() : ${fallback}`;
     },

package/package.json

@@ -25,7 +25,7 @@
     "chokidar": "^3.5.3",
     "listhen": "^1.4.4"
   },
-  "version": "0.0.20",
+  "version": "0.0.22",
   "repository": {
     "url": "https://github.com/modiimedia/arri"
   }