@orizm/cli 1.0.2 → 1.1.0

package/dist/cli.js

@@ -1,5 +1,5 @@
 // src/cli.ts
-import { Command as Command6, program } from "commander";
+import { Command as Command8, program } from "commander";
 
 // src/cms/generate/command.ts
 import { Command } from "commander";
@@ -96,20 +96,75 @@ function createSpinner() {
 }
 
 // src/lib/handle-error.ts
+import * as v3 from "valibot";
+import cliColor3 from "cli-color";
+
+// src/lib/display-valibot-error.ts
 import * as v2 from "valibot";
 import cliColor2 from "cli-color";
+function displayValibotError(error2) {
+  if (!v2.isValiError(error2)) {
+    return;
+  }
+  console.error(`Error: ${error2.issues.length} problem(s) found.`);
+  console.error(buildValiErrorMessage(error2));
+}
+function buildValiErrorMessage(e, options) {
+  const { color = true } = options ?? {};
+  return e.issues.map((issue) => {
+    const path3 = getPath(issue);
+    return `  ${getIssueMessage(issue.message, color)} (at ${getLocationPath(path3, color)})`;
+  }).join("\n");
+}
+function getIssueMessage(message, color) {
+  return color ? cliColor2.red(message) : message;
+}
+function getLocationPath(path3, color) {
+  return color ? cliColor2.yellow(path3) : path3;
+}
+function getPath(issue) {
+  const issueDotPath = v2.getDotPath(issue);
+  const pathInfo = issue.path;
+  if (!issueDotPath || !pathInfo) {
+    return "";
+  }
+  const pathParts = issueDotPath.split(".");
+  let pathInfoIndex = 0;
+  for (let i = 0; i < pathParts.length; i++) {
+    const part = pathParts[i];
+    if (!isNumberIndex(part)) {
+      continue;
+    }
+    const index = parseInt(part);
+    for (let j = pathInfoIndex; j < pathInfo.length; j++) {
+      const pathItem = pathInfo[j];
+      if (pathItem.type === "array" && pathItem.key === index) {
+        if (pathItem.value && typeof pathItem.value === "object" && "name" in pathItem.value) {
+          pathParts[i] = String(pathItem.value.name);
+          pathInfoIndex = j + 1;
+          break;
+        }
+      }
+    }
+  }
+  return pathParts.join(".");
+}
+function isNumberIndex(part) {
+  return /^\d+$/.test(part);
+}
+
+// src/lib/handle-error.ts
 function handleError(error2) {
   show();
-  if (v2.isValiError(error2)) {
+  if (v3.isValiError(error2)) {
     console.error();
-    console.error(`Error: ${error2.issues.length} problem(s) found.`);
-    console.error(buildValiErrorMessage(error2));
+    displayValibotError(error2);
     console.error();
     process.exit(1);
   }
   console.error();
   console.error(
-    cliColor2.red(
+    cliColor3.red(
       "Something went wrong. Please check the error below for more details."
     )
   );
@@ -118,11 +173,6 @@ function handleError(error2) {
   console.error();
   process.exit(1);
 }
-function buildValiErrorMessage(e) {
-  return e.issues.map((issue) => {
-    return `  ${cliColor2.red(issue.message)} (at ${cliColor2.yellow(v2.getDotPath(issue))})`;
-  }).join("\n");
-}
 
 // src/cms/generate/generator.ts
 import { mkdir, writeFile } from "fs/promises";
@@ -130,7 +180,7 @@ import path from "path";
 import Handlebars from "handlebars";
 
 // src/cms/templates/types.ts.hbr
-var types_ts_default = '//  This file was automatically generated and should not be edited.\n\nimport { FormValidationRules, StorageItemType } from "@orizm/common";\n\n// Utilities\ntype _ModuleRef<T> = T & _ModuleDescriptor;\ntype _ModuleDescriptor = {\n    isModule: true;\n};\ntype _ArrayModuleRef<T> = T & _ArrayModuleDescriptor;\ntype _ArrayModuleDescriptor = {\n    isModuleArray: true;\n};\n\n// Tables\n{{#each tables}}\nexport type {{toCodeTypeName this.name}} = {\n  id: string;\n  createdAt: string;\n  updatedAt: string;\n  {{#unless this.isSubmissions}}\n  group?: string;\n  publishedAt?: string;\n  _draft?: boolean;\n  _published?: boolean;\n  scheduledPublishAt?: string | null;\n  scheduledUnpublishAt?: string | null;\n  {{else}}\n  _formId: string;\n  _content: unknown;\n  _formSchema: unknown;\n  _attachments: StorageItemType[];\n  {{/unless}}\n  {{#each this.columns}}\n  {{this.name}}{{#unless this.required}}?{{/unless}}: {{typeName this}};\n  {{/each}}\n  {{#if this.enableForm}}\n  formSchema: FormValidationRules;\n  {{/if}}\n};\n\nexport type {{toCodeTypeName this.name}}CreateInput = {\n  {{#unless this.isSubmissions}}\n  group?: string;\n  publishedAt?: string;\n  scheduledPublishAt?: string | null;\n  scheduledUnpublishAt?: string | null;\n  createdAt?: string;\n  {{/unless}}\n  {{#each this.columns}}\n  {{this.name}}{{#unless this.required}}?{{/unless}}: {{typeName this}};\n  {{/each}}\n  {{#if this.enableForm}}\n  formSchema: FormValidationRules;\n  {{/if}}\n};\n\nexport type {{toCodeTypeName this.name}}UpdateInput = {\n  {{#each this.columns}}\n  {{#unless this.readOnly}}{{this.name}}?: {{typeName this}}{{#unless this.required}} | null{{/unless}};{{/unless}}\n  {{/each}}\n  {{#unless this.isSubmissions}}\n  publishedAt?: string;\n  scheduledPublishAt?: string | null;\n  scheduledUnpublishAt?: string | null;\n  createdAt?: string;\n  {{/unless}}\n  {{#if this.enableForm}}\n  formSchema: FormValidationRules;\n  {{/if}}\n};\n{{/each}}\n\n// Module types\n{{#each tableModules}}\nexport type {{toCodeTypeName this.name}} = {\n  id?: string;\n  {{#each this.columns}}\n  {{this.name}}{{#unless this.required}}?{{/unless}}: {{typeName this}};\n  {{/each}}\n};\n{{/each}}\n\n\n// Descriptor types\n{{#each tables}}\nexport type {{toCodeTypeName this.name}}__Descriptor = {\n  row: {{toCodeTypeName this.name}};\n  create: {{toCodeTypeName this.name}}CreateInput;\n  update: {{toCodeTypeName this.name}}UpdateInput;\n  {{#if (filterRefColumn this.columns)}}\n  refs: {\n    {{#each (filterRefColumn this.columns)}}\n    {{includeName this}}: {{{includeType this}}};\n    {{/each}}\n  }\n  {{/if}}\n  {{#unless (filterRefColumn this.columns)}}\n  refs: object;\n  {{/unless}}\n  {{#if (filterUniqueIndexes this.indexes)}}\n  unique: [\n    {{#each (filterUniqueIndexes this.indexes)}}\n      { {{#each (getIndexColumns ../this this)}}{{this.name}}:{{typeName this}},{{/each}} },\n    {{/each}}\n  ]\n  {{/if}}\n  {{#unless (filterUniqueIndexes this.indexes)}}\n  unique: [];\n  {{/unless}}\n  {{#if this.enableDrafts}}\n  enableDrafts: true;\n  {{/if}}\n  {{#if this.enableForm}}\n  submissionDescriptor: {{toCodeTypeName this.name}}_Submission__Descriptor;\n  {{else}}\n  submissionDescriptor: never;\n  {{/if}}\n};\n{{/each}}\n\n\n{{#each tableModules}}\nexport type {{toCodeTypeName this.name}}__Descriptor = {\n  row: {{toCodeTypeName this.name}};\n  {{#if (filterRefColumn this.columns)}}\n  refs: {\n    {{#each (filterRefColumn this.columns)}}\n    {{includeName this}}: {{{includeType this}}};\n    {{/each}}\n  }\n  {{/if}}\n  {{#unless (filterRefColumn this.columns)}}\n  refs: object;\n  {{/unless}}\n  unique:[]\n};\n{{/each}}\n\n\n// Webhook types\nexport type WebhookEvent = "content.create" | "content.update" | "content.delete";\nexport type WebhookPayload = {\n  event: WebhookEvent;\n  timestamp: string;\n  project: string;\n} & (\n  {{#each tables}}\n  | {\n      table: "{{this.name}}";\n      content: {{toCodeTypeName this.name}};\n      old?: {{toCodeTypeName this.name}};\n    }\n  {{/each}}\n)\n';
+var types_ts_default = '//  This file was automatically generated and should not be edited.\n\nimport { FormValidationRules, StorageItemType } from "@orizm/common";\n\n// Utilities\ntype _ModuleRef<T> = T & _ModuleDescriptor;\ntype _ModuleDescriptor = {\n    isModule: true;\n};\ntype _ArrayModuleRef<T> = T & _ArrayModuleDescriptor;\ntype _ArrayModuleDescriptor = {\n    isModuleArray: true;\n};\n\n// Tables\n{{#each tables}}\nexport type {{toCodeTypeName this.name}} = {\n  id: string;\n  createdAt: string;\n  updatedAt: string;\n  {{#unless this.isSubmissions}}\n  group?: string;\n  publishedAt?: string;\n  _draft?: boolean;\n  _published?: boolean;\n  scheduledPublishAt?: string | null;\n  scheduledUnpublishAt?: string | null;\n  {{else}}\n  _formId: string;\n  _content: unknown;\n  _formSchema: unknown;\n  _attachments: StorageItemType[];\n  {{/unless}}\n  {{#each this.columns}}\n  {{this.name}}{{#unless this.required}}?{{/unless}}: {{typeName this}};\n  {{/each}}\n  {{#if this.enableForm}}\n  formSchema: FormValidationRules;\n  {{/if}}\n};\n\nexport type {{toCodeTypeName this.name}}CreateInput = {\n  {{#unless this.isSubmissions}}\n  group?: string;\n  publishedAt?: string;\n  scheduledPublishAt?: string | null;\n  scheduledUnpublishAt?: string | null;\n  createdAt?: string;\n  {{/unless}}\n  {{#each this.columns}}\n  {{this.name}}{{#unless this.required}}?{{/unless}}: {{typeName this}};\n  {{/each}}\n  {{#if this.enableForm}}\n  formSchema: FormValidationRules;\n  {{/if}}\n};\n\nexport type {{toCodeTypeName this.name}}UpdateInput = {\n  {{#each this.columns}}\n  {{#unless this.readOnly}}{{this.name}}?: {{typeName this}}{{#unless this.required}} | null{{/unless}};{{/unless}}\n  {{/each}}\n  {{#unless this.isSubmissions}}\n  publishedAt?: string;\n  scheduledPublishAt?: string | null;\n  scheduledUnpublishAt?: string | null;\n  createdAt?: string;\n  {{/unless}}\n  {{#if this.enableForm}}\n  formSchema: FormValidationRules;\n  {{/if}}\n};\n{{/each}}\n\n// Module types\n{{#each tableModules}}\nexport type {{toCodeTypeName this.name}} = {\n  id?: string;\n  {{#each this.columns}}\n  {{this.name}}{{#unless this.required}}?{{/unless}}: {{typeName this}};\n  {{/each}}\n};\n{{/each}}\n\n\n// Descriptor types\n{{#each tables}}\nexport type {{toCodeTypeName this.name}}__Descriptor = {\n  row: {{toCodeTypeName this.name}};\n  create: {{toCodeTypeName this.name}}CreateInput;\n  update: {{toCodeTypeName this.name}}UpdateInput;\n  {{#if (filterRefColumn this.columns)}}\n  refs: {\n    {{#each (filterRefColumn this.columns)}}\n    {{includeName this}}: {{{includeType this}}};\n    {{/each}}\n  }\n  {{/if}}\n  {{#unless (filterRefColumn this.columns)}}\n  refs: object;\n  {{/unless}}\n  {{#if (filterUniqueIndexes this.indexes)}}\n  unique: [\n    {{#each (filterUniqueIndexes this.indexes)}}\n      { {{#each (getIndexColumns ../this this)}}{{this.name}}:{{typeName this}},{{/each}} },\n    {{/each}}\n  ]\n  {{/if}}\n  {{#unless (filterUniqueIndexes this.indexes)}}\n  unique: [];\n  {{/unless}}\n  {{#if this.enableDrafts}}\n  enableDrafts: true;\n  {{/if}}\n  {{#if this.enableForm}}\n  submissionDescriptor: {{toCodeTypeName this.name}}_Submission__Descriptor;\n  {{else}}\n  submissionDescriptor: never;\n  {{/if}}\n};\n{{/each}}\n\n\n{{#each tableModules}}\nexport type {{toCodeTypeName this.name}}__Descriptor = {\n  row: {{toCodeTypeName this.name}};\n  {{#if (filterRefColumn this.columns)}}\n  refs: {\n    {{#each (filterRefColumn this.columns)}}\n    {{includeName this}}: {{{includeType this}}};\n    {{/each}}\n  }\n  {{/if}}\n  {{#unless (filterRefColumn this.columns)}}\n  refs: object;\n  {{/unless}}\n  unique:[]\n};\n{{/each}}\n\n\n// Webhook types\nexport type WebhookEvent = "content.create" | "content.update" | "content.delete";\ntype WebhookPayloadBase = {\n  event: WebhookEvent;\n  timestamp: string;\n  project: string;\n};\n{{#if tables}}\nexport type WebhookPayload = WebhookPayloadBase & (\n  {{#each tables}}\n  | {\n      table: "{{this.name}}";\n      content: {{toCodeTypeName this.name}};\n      old?: {{toCodeTypeName this.name}};\n    }\n  {{/each}}\n);\n{{else}}\nexport type WebhookPayload = WebhookPayloadBase;\n{{/if}}\n';
 
 // src/cms/templates/client.ts.hbr
 var client_ts_default = '//  This file was automatically generated and should not be edited.\n\nimport { OrizmCMSClient } from "@orizm/cms-sdk";\n\nimport * as Models from "./types";\n\nexport class CMSClient {\n  constructor(protected client: OrizmCMSClient) {\n    this.tables = {\n      {{#each tables}}\n      {{toEndpointName this.name}}: this.client.getTableClient<Models.{{toCodeTypeName this.name}}__Descriptor>("{{toEndpointName this.name}}"),\n      {{/each}}\n    };\n\n    this.buckets = {\n      {{#each buckets}}\n      {{toEndpointName this.name}}: this.client.getBucketClient("{{toEndpointName this.name}}"),\n      {{/each}}\n    };\n\n    this.userManagement = this.client.userManagement;\n  \n    this.userinfo = this.client.userinfo;\n  \n    this.auth = this.client.auth;\n  }\n\n  readonly tables;\n  readonly buckets;\n  readonly userManagement;\n  readonly userinfo;\n  readonly auth;\n}\n';
@@ -144,24 +194,21 @@ function toCodeTypeName(str) {
   return str.replace(/_([a-z])/g, (g) => g[1].toUpperCase());
 }
 Handlebars.registerHelper("toCodeTypeName", toCodeTypeName);
-Handlebars.registerHelper(
-  "typeName",
-  (column) => {
-    if (column.type === "reference") {
-      return "string";
-    } else if (column.type === "module") {
-      return toCodeTypeName(column.moduleName);
-    } else if (column.type === "module-array") {
-      return toCodeTypeName(column.moduleName) + "[]";
-    } else if (column.type == "json") {
-      return "unknown";
-    } else if (column.type === "storage") {
-      return "StorageItemType";
-    } else {
-      return column.type;
-    }
+Handlebars.registerHelper("typeName", (column) => {
+  if (column.type === "reference") {
+    return "string";
+  } else if (column.type === "module") {
+    return toCodeTypeName(column.moduleName);
+  } else if (column.type === "module-array") {
+    return toCodeTypeName(column.moduleName) + "[]";
+  } else if (column.type == "json") {
+    return "unknown";
+  } else if (column.type === "storage") {
+    return "StorageItemType";
+  } else {
+    return column.type;
   }
-);
+});
 Handlebars.registerHelper(
   "filterRefColumn",
   (columns) => {
@@ -208,7 +255,7 @@ Handlebars.registerHelper(
   }
 );
 async function generate(options) {
-  const config = options.projectDef;
+  const config = options.config;
   await mkdir(options.output, { recursive: true });
   await renderTypes(config, options.output);
   await renderClient(config, options.output);
@@ -238,11 +285,11 @@ var spinner = createSpinner();
 var cmsGenerateCommand = new Command("generate").description("generate orizm client and types.").option("-c, --config <path>", "orizm config file path.", "orizm.config.ts").option("-o, --output <path>", "output directory.", "./src/orizm").action(async (options) => {
   try {
     spinner.start("Loading project schema...");
-    const projectDef = await loadConfig(options.config);
+    const config = await loadConfig(options.config);
     spinner.succeed("Loaded project schema.");
     spinner.start("Generating code...");
     await generate({
-      projectDef,
+      config,
       output: options.output
     });
     spinner.succeed(`Generated code to '${options.output}'`);
@@ -254,36 +301,491 @@ var cmsGenerateCommand = new Command("generate").description("generate orizm cli
 // src/cms/pull/command.ts
 import { Command as Command2 } from "commander";
 
-// src/api/developer-api-client.ts
-import createClient from "openapi-fetch";
-function createDeveloperAPIClient(baseUrl, apiKey) {
-  const url = new URL(baseUrl);
-  url.pathname = `/api/dev/v1`;
-  return createClient({
-    baseUrl: url.toString(),
-    headers: {
-      "x-api-key": apiKey
+// ../../node_modules/.pnpm/openapi-fetch@0.13.5/node_modules/openapi-fetch/dist/index.js
+var PATH_PARAM_RE = /\{[^{}]+\}/g;
+var supportsRequestInitExt = () => {
+  return typeof process === "object" && Number.parseInt(process?.versions?.node?.substring(0, 2)) >= 18 && process.versions.undici;
+};
+function randomID() {
+  return Math.random().toString(36).slice(2, 11);
+}
+function createClient(clientOptions) {
+  let {
+    baseUrl = "",
+    Request: CustomRequest = globalThis.Request,
+    fetch: baseFetch = globalThis.fetch,
+    querySerializer: globalQuerySerializer,
+    bodySerializer: globalBodySerializer,
+    headers: baseHeaders,
+    requestInitExt = void 0,
+    ...baseOptions
+  } = { ...clientOptions };
+  requestInitExt = supportsRequestInitExt() ? requestInitExt : void 0;
+  baseUrl = removeTrailingSlash(baseUrl);
+  const middlewares = [];
+  async function coreFetch(schemaPath, fetchOptions) {
+    const {
+      baseUrl: localBaseUrl,
+      fetch = baseFetch,
+      Request = CustomRequest,
+      headers,
+      params = {},
+      parseAs = "json",
+      querySerializer: requestQuerySerializer,
+      bodySerializer = globalBodySerializer ?? defaultBodySerializer,
+      body,
+      ...init
+    } = fetchOptions || {};
+    if (localBaseUrl) {
+      baseUrl = removeTrailingSlash(localBaseUrl);
+    }
+    let querySerializer = typeof globalQuerySerializer === "function" ? globalQuerySerializer : createQuerySerializer(globalQuerySerializer);
+    if (requestQuerySerializer) {
+      querySerializer = typeof requestQuerySerializer === "function" ? requestQuerySerializer : createQuerySerializer({
+        ...typeof globalQuerySerializer === "object" ? globalQuerySerializer : {},
+        ...requestQuerySerializer
+      });
     }
+    const serializedBody = body === void 0 ? void 0 : bodySerializer(body);
+    const defaultHeaders = (
+      // with no body, we should not to set Content-Type
+      serializedBody === void 0 || // if serialized body is FormData; browser will correctly set Content-Type & boundary expression
+      serializedBody instanceof FormData ? {} : {
+        "Content-Type": "application/json"
+      }
+    );
+    const requestInit = {
+      redirect: "follow",
+      ...baseOptions,
+      ...init,
+      body: serializedBody,
+      headers: mergeHeaders(defaultHeaders, baseHeaders, headers, params.header)
+    };
+    let id;
+    let options;
+    let request = new CustomRequest(createFinalURL(schemaPath, { baseUrl, params, querySerializer }), requestInit);
+    let response;
+    for (const key in init) {
+      if (!(key in request)) {
+        request[key] = init[key];
+      }
+    }
+    if (middlewares.length) {
+      id = randomID();
+      options = Object.freeze({
+        baseUrl,
+        fetch,
+        parseAs,
+        querySerializer,
+        bodySerializer
+      });
+      for (const m of middlewares) {
+        if (m && typeof m === "object" && typeof m.onRequest === "function") {
+          const result = await m.onRequest({
+            request,
+            schemaPath,
+            params,
+            options,
+            id
+          });
+          if (result) {
+            if (result instanceof CustomRequest) {
+              request = result;
+            } else if (result instanceof Response) {
+              response = result;
+              break;
+            } else {
+              throw new Error("onRequest: must return new Request() or Response() when modifying the request");
+            }
+          }
+        }
+      }
+    }
+    if (!response) {
+      try {
+        response = await fetch(request, requestInitExt);
+      } catch (error3) {
+        let errorAfterMiddleware = error3;
+        if (middlewares.length) {
+          for (let i = middlewares.length - 1; i >= 0; i--) {
+            const m = middlewares[i];
+            if (m && typeof m === "object" && typeof m.onError === "function") {
+              const result = await m.onError({
+                request,
+                error: errorAfterMiddleware,
+                schemaPath,
+                params,
+                options,
+                id
+              });
+              if (result) {
+                if (result instanceof Response) {
+                  errorAfterMiddleware = void 0;
+                  response = result;
+                  break;
+                }
+                if (result instanceof Error) {
+                  errorAfterMiddleware = result;
+                  continue;
+                }
+                throw new Error("onError: must return new Response() or instance of Error");
+              }
+            }
+          }
+        }
+        if (errorAfterMiddleware) {
+          throw errorAfterMiddleware;
+        }
+      }
+      if (middlewares.length) {
+        for (let i = middlewares.length - 1; i >= 0; i--) {
+          const m = middlewares[i];
+          if (m && typeof m === "object" && typeof m.onResponse === "function") {
+            const result = await m.onResponse({
+              request,
+              response,
+              schemaPath,
+              params,
+              options,
+              id
+            });
+            if (result) {
+              if (!(result instanceof Response)) {
+                throw new Error("onResponse: must return new Response() when modifying the response");
+              }
+              response = result;
+            }
+          }
+        }
+      }
+    }
+    if (response.status === 204 || response.headers.get("Content-Length") === "0") {
+      return response.ok ? { data: void 0, response } : { error: void 0, response };
+    }
+    if (response.ok) {
+      if (parseAs === "stream") {
+        return { data: response.body, response };
+      }
+      return { data: await response[parseAs](), response };
+    }
+    let error2 = await response.text();
+    try {
+      error2 = JSON.parse(error2);
+    } catch {
+    }
+    return { error: error2, response };
+  }
+  return {
+    request(method, url, init) {
+      return coreFetch(url, { ...init, method: method.toUpperCase() });
+    },
+    /** Call a GET endpoint */
+    GET(url, init) {
+      return coreFetch(url, { ...init, method: "GET" });
+    },
+    /** Call a PUT endpoint */
+    PUT(url, init) {
+      return coreFetch(url, { ...init, method: "PUT" });
+    },
+    /** Call a POST endpoint */
+    POST(url, init) {
+      return coreFetch(url, { ...init, method: "POST" });
+    },
+    /** Call a DELETE endpoint */
+    DELETE(url, init) {
+      return coreFetch(url, { ...init, method: "DELETE" });
+    },
+    /** Call a OPTIONS endpoint */
+    OPTIONS(url, init) {
+      return coreFetch(url, { ...init, method: "OPTIONS" });
+    },
+    /** Call a HEAD endpoint */
+    HEAD(url, init) {
+      return coreFetch(url, { ...init, method: "HEAD" });
+    },
+    /** Call a PATCH endpoint */
+    PATCH(url, init) {
+      return coreFetch(url, { ...init, method: "PATCH" });
+    },
+    /** Call a TRACE endpoint */
+    TRACE(url, init) {
+      return coreFetch(url, { ...init, method: "TRACE" });
+    },
+    /** Register middleware */
+    use(...middleware) {
+      for (const m of middleware) {
+        if (!m) {
+          continue;
+        }
+        if (typeof m !== "object" || !("onRequest" in m || "onResponse" in m || "onError" in m)) {
+          throw new Error("Middleware must be an object with one of `onRequest()`, `onResponse() or `onError()`");
+        }
+        middlewares.push(m);
+      }
+    },
+    /** Unregister middleware */
+    eject(...middleware) {
+      for (const m of middleware) {
+        const i = middlewares.indexOf(m);
+        if (i !== -1) {
+          middlewares.splice(i, 1);
+        }
+      }
+    }
+  };
+}
+function serializePrimitiveParam(name, value, options) {
+  if (value === void 0 || value === null) {
+    return "";
+  }
+  if (typeof value === "object") {
+    throw new Error(
+      "Deeply-nested arrays/objects aren\u2019t supported. Provide your own `querySerializer()` to handle these."
+    );
+  }
+  return `${name}=${options?.allowReserved === true ? value : encodeURIComponent(value)}`;
+}
+function serializeObjectParam(name, value, options) {
+  if (!value || typeof value !== "object") {
+    return "";
+  }
+  const values = [];
+  const joiner = {
+    simple: ",",
+    label: ".",
+    matrix: ";"
+  }[options.style] || "&";
+  if (options.style !== "deepObject" && options.explode === false) {
+    for (const k in value) {
+      values.push(k, options.allowReserved === true ? value[k] : encodeURIComponent(value[k]));
+    }
+    const final2 = values.join(",");
+    switch (options.style) {
+      case "form": {
+        return `${name}=${final2}`;
+      }
+      case "label": {
+        return `.${final2}`;
+      }
+      case "matrix": {
+        return `;${name}=${final2}`;
+      }
+      default: {
+        return final2;
+      }
+    }
+  }
+  for (const k in value) {
+    const finalName = options.style === "deepObject" ? `${name}[${k}]` : k;
+    values.push(serializePrimitiveParam(finalName, value[k], options));
+  }
+  const final = values.join(joiner);
+  return options.style === "label" || options.style === "matrix" ? `${joiner}${final}` : final;
+}
+function serializeArrayParam(name, value, options) {
+  if (!Array.isArray(value)) {
+    return "";
+  }
+  if (options.explode === false) {
+    const joiner2 = { form: ",", spaceDelimited: "%20", pipeDelimited: "|" }[options.style] || ",";
+    const final = (options.allowReserved === true ? value : value.map((v6) => encodeURIComponent(v6))).join(joiner2);
+    switch (options.style) {
+      case "simple": {
+        return final;
+      }
+      case "label": {
+        return `.${final}`;
+      }
+      case "matrix": {
+        return `;${name}=${final}`;
+      }
+      // case "spaceDelimited":
+      // case "pipeDelimited":
+      default: {
+        return `${name}=${final}`;
+      }
+    }
+  }
+  const joiner = { simple: ",", label: ".", matrix: ";" }[options.style] || "&";
+  const values = [];
+  for (const v6 of value) {
+    if (options.style === "simple" || options.style === "label") {
+      values.push(options.allowReserved === true ? v6 : encodeURIComponent(v6));
+    } else {
+      values.push(serializePrimitiveParam(name, v6, options));
+    }
+  }
+  return options.style === "label" || options.style === "matrix" ? `${joiner}${values.join(joiner)}` : values.join(joiner);
+}
+function createQuerySerializer(options) {
+  return function querySerializer(queryParams) {
+    const search = [];
+    if (queryParams && typeof queryParams === "object") {
+      for (const name in queryParams) {
+        const value = queryParams[name];
+        if (value === void 0 || value === null) {
+          continue;
+        }
+        if (Array.isArray(value)) {
+          if (value.length === 0) {
+            continue;
+          }
+          search.push(
+            serializeArrayParam(name, value, {
+              style: "form",
+              explode: true,
+              ...options?.array,
+              allowReserved: options?.allowReserved || false
+            })
+          );
+          continue;
+        }
+        if (typeof value === "object") {
+          search.push(
+            serializeObjectParam(name, value, {
+              style: "deepObject",
+              explode: true,
+              ...options?.object,
+              allowReserved: options?.allowReserved || false
+            })
+          );
+          continue;
+        }
+        search.push(serializePrimitiveParam(name, value, options));
+      }
+    }
+    return search.join("&");
+  };
+}
+function defaultPathSerializer(pathname, pathParams) {
+  let nextURL = pathname;
+  for (const match of pathname.match(PATH_PARAM_RE) ?? []) {
+    let name = match.substring(1, match.length - 1);
+    let explode = false;
+    let style = "simple";
+    if (name.endsWith("*")) {
+      explode = true;
+      name = name.substring(0, name.length - 1);
+    }
+    if (name.startsWith(".")) {
+      style = "label";
+      name = name.substring(1);
+    } else if (name.startsWith(";")) {
+      style = "matrix";
+      name = name.substring(1);
+    }
+    if (!pathParams || pathParams[name] === void 0 || pathParams[name] === null) {
+      continue;
+    }
+    const value = pathParams[name];
+    if (Array.isArray(value)) {
+      nextURL = nextURL.replace(match, serializeArrayParam(name, value, { style, explode }));
+      continue;
+    }
+    if (typeof value === "object") {
+      nextURL = nextURL.replace(match, serializeObjectParam(name, value, { style, explode }));
+      continue;
+    }
+    if (style === "matrix") {
+      nextURL = nextURL.replace(match, `;${serializePrimitiveParam(name, value)}`);
+      continue;
+    }
+    nextURL = nextURL.replace(match, style === "label" ? `.${encodeURIComponent(value)}` : encodeURIComponent(value));
+  }
+  return nextURL;
+}
+function defaultBodySerializer(body) {
+  if (body instanceof FormData) {
+    return body;
+  }
+  return JSON.stringify(body);
+}
+function createFinalURL(pathname, options) {
+  let finalURL = `${options.baseUrl}${pathname}`;
+  if (options.params?.path) {
+    finalURL = defaultPathSerializer(finalURL, options.params.path);
+  }
+  let search = options.querySerializer(options.params.query ?? {});
+  if (search.startsWith("?")) {
+    search = search.substring(1);
+  }
+  if (search) {
+    finalURL += `?${search}`;
+  }
+  return finalURL;
+}
+function mergeHeaders(...allHeaders) {
+  const finalHeaders = new Headers();
+  for (const h of allHeaders) {
+    if (!h || typeof h !== "object") {
+      continue;
+    }
+    const iterator = h instanceof Headers ? h.entries() : Object.entries(h);
+    for (const [k, v6] of iterator) {
+      if (v6 === null) {
+        finalHeaders.delete(k);
+      } else if (Array.isArray(v6)) {
+        for (const v22 of v6) {
+          finalHeaders.append(k, v22);
+        }
+      } else if (v6 !== void 0) {
+        finalHeaders.set(k, v6);
+      }
+    }
+  }
+  return finalHeaders;
+}
+function removeTrailingSlash(url) {
+  if (url.endsWith("/")) {
+    return url.substring(0, url.length - 1);
+  }
+  return url;
+}
+
+// ../private-api-clients/src/assert-valid-url-origin.ts
+function assertValidUrlOrigin(origin) {
+  const url = new URL(origin);
+  if (url.origin !== origin) {
+    throw new Error(`${origin} is not a valid URL origin`);
+  }
+}
+
+// ../private-api-clients/src/dev-v2-api-client.ts
+function createDeveloperAPIv2Client({
+  serverOrigin = "",
+  fetch,
+  headers
+}) {
+  if (serverOrigin) assertValidUrlOrigin(serverOrigin);
+  return createClient({
+    baseUrl: `${serverOrigin}/api/dev/v2`,
+    fetch,
+    headers
   });
 }
 
-// src/lib/fetch-definition-reference.ts
-async function fetchDefinitionReference(options) {
-  const client = createDeveloperAPIClient(options.baseUrl, options.apiKey);
+// src/lib/fetch-current-definition.ts
+async function fetchCurrentDefinition(options) {
+  const client = createDeveloperAPIv2Client({
+    serverOrigin: options.baseUrl,
+    headers: {
+      "x-api-key": options.apiKey
+    }
+  });
   const abortController = new AbortController();
   const timeout = setTimeout(() => {
     abortController.abort();
   }, 1e4);
   try {
     const response = await client.GET(
-      "/projects/{projectName}/definitions/current/reference",
+      "/projects/{projectName}/definitions/current",
       {
         params: { path: { projectName: options.projectName } },
         signal: abortController.signal
       }
     );
     if (response.data) {
-      return response.data.content;
+      return response.data;
     }
     if (response.response.status === 404) {
       throw new Error(`Project ${options.projectName} not found.`);
@@ -306,26 +808,26 @@ async function fetchDefinitionReference(options) {
 
 // src/lib/load-env.ts
 import fs from "fs/promises";
-import * as v3 from "valibot";
+import * as v4 from "valibot";
 import dotenv from "dotenv";
 var DEFAULT_ENV_FILE_PATH = ".env";
-var EnvSchema = v3.object({
-  ORIZM_PROJECT: v3.pipe(
-    v3.string(),
-    v3.minLength(1, "ORIZM_PROJECT is required"),
-    v3.brand("ORIZM_PROJECT")
+var EnvSchema = v4.object({
+  ORIZM_PROJECT: v4.pipe(
+    v4.string(),
+    v4.minLength(1, "ORIZM_PROJECT is required"),
+    v4.brand("ORIZM_PROJECT")
   ),
-  ORIZM_BASE_URL: v3.pipe(
-    v3.optional(v3.string(), "https://app.orizm.com"),
+  ORIZM_BASE_URL: v4.pipe(
+    v4.optional(v4.string(), "https://app.orizm.com"),
     // if null, use default value
-    v3.transform((v4) => v4.replace(/\/$/, "")),
+    v4.transform((v6) => v6.replace(/\/$/, "")),
     // remove trailing slash
-    v3.brand("ORIZM_BASE_URL")
+    v4.brand("ORIZM_BASE_URL")
   ),
-  ORIZM_API_KEY: v3.pipe(
-    v3.string(),
-    v3.minLength(1, "ORIZM_API_KEY is required"),
-    v3.brand("ORIZM_API_KEY")
+  ORIZM_API_KEY: v4.pipe(
+    v4.string(),
+    v4.minLength(1, "ORIZM_API_KEY is required"),
+    v4.brand("ORIZM_API_KEY")
   )
 });
 async function loadEnv(envPath) {
@@ -340,7 +842,7 @@ async function loadEnv(envPath) {
   }
   if (envFileContent !== null) {
     const dotenvParsed = dotenv.parse(envFileContent);
-    const envParseResult = v3.safeParse(EnvSchema, dotenvParsed);
+    const envParseResult = v4.safeParse(EnvSchema, dotenvParsed);
     if (!envParseResult.success) {
       throw new Error(
         `Environment variables are not valid.
@@ -349,7 +851,7 @@ async function loadEnv(envPath) {
     }
     return envParseResult.output;
   }
-  const processEnvParseResult = v3.safeParse(EnvSchema, process.env);
+  const processEnvParseResult = v4.safeParse(EnvSchema, process.env);
   if (!processEnvParseResult.success) {
     throw new Error(
       "Environment variables are not valid. Put .env file or set environment variables in process.env.\n" + processEnvParseResult.issues.map((issue) => issue.message).join("\n")
@@ -364,17 +866,17 @@ async function pullAction(options) {
   spinner2.start("Loading environment variables...");
   const env = await loadEnv(options.envPath);
   spinner2.succeed("Loaded environment variables.");
-  spinner2.start("Loading project schema...");
-  const definitionReference = await fetchDefinitionReference({
+  spinner2.start("Loading project config...");
+  const definitionReference = await fetchCurrentDefinition({
     baseUrl: env.ORIZM_BASE_URL,
     apiKey: env.ORIZM_API_KEY,
     projectName: env.ORIZM_PROJECT
   });
-  spinner2.succeed("Loaded project schema.");
+  spinner2.succeed("Loaded project config.");
   spinner2.start("Generating code...");
   await generate({
     output: options.destination,
-    projectDef: definitionReference
+    config: definitionReference.parsed
   });
   spinner2.succeed(`Generated code to '${options.destination}'`);
 }
@@ -403,7 +905,7 @@ import Handlebars2 from "handlebars";
 var client_ts_default2 = '//  This file was automatically generated and should not be edited.\n\nimport { ConsumerClientOptions, OrizmConsumerClientBase } from "@orizm/consumer-sdk";\nimport * as Models from "./types";\n\nexport class OrizmClient extends OrizmConsumerClientBase {\n  constructor(options: ConsumerClientOptions) {\n    super(options);\n  }\n\n  readonly tables = {\n    {{#each tables}}\n    {{toEndpointName this.name}}: this.getTableClient<Models.{{toCodeTypeName this.name}}__Descriptor>("{{toEndpointName this.name}}"),\n    {{/each}}\n  };\n}\n';
 
 // src/consumer/templates/types.ts.hbr
-var types_ts_default2 = '//  This file was automatically generated and should not be edited.\n\nimport { FormValidationRules, StorageItemType } from "@orizm/common";\n\n// Utilities\ntype _ModuleRef<T> = T & _ModuleDescriptor;\ntype _ModuleDescriptor = {\n    isModule: true;\n};\ntype _ArrayModuleRef<T> = T & _ArrayModuleDescriptor;\ntype _ArrayModuleDescriptor = {\n    isModuleArray: true;\n};\n\n\n// Tables\n{{#each tables}}\nexport type {{toCodeTypeName this.name}} = {\n  id: string;\n  createdAt: string;\n  updatedAt: string;\n  group?: string;\n  publishedAt?: string;\n  _draft?: boolean;\n  _published?: boolean;\n  {{#each this.columns}}\n  {{this.name}}{{#unless this.required}}?{{/unless}}: {{typeName this}};\n  {{/each}}\n  {{#if this.enableForm}}\n  formSchema: FormValidationRules;\n  {{/if}}\n}\n\n{{/each}}\n\n{{#each tableModules}}\nexport type {{toCodeTypeName this.name}} = {\n  {{#each this.columns}}\n  {{this.name}}{{#unless this.required}}?{{/unless}}: {{typeName this}};\n  {{/each}}\n};\n{{/each}}\n\n// Descriptor types\n{{#each tables}}\nexport type {{toCodeTypeName this.name}}__Descriptor = {\n  row: {{toCodeTypeName this.name}};\n  {{#if (filterRefColumn this.columns)}}\n  refs: {\n    {{#each (filterRefColumn this.columns)}}\n    {{includeName this}}: {{{includeType this}}};\n    {{/each}}\n  }\n  {{/if}}\n  {{#unless (filterRefColumn this.columns)}}\n  refs: object;\n  {{/unless}}\n  {{#if (filterUniqueIndexes this.indexes)}}\n  unique: [\n    {{#each (filterUniqueIndexes this.indexes)}}\n      { {{#each (getIndexColumns ../this this)}}{{this.name}}:{{typeName this}},{{/each}} },\n    {{/each}}\n  ]\n  {{/if}}\n  {{#unless (filterUniqueIndexes this.indexes)}}\n  unique: [];\n  {{/unless}}\n  {{#if this.enableDrafts}}\n  enableDrafts: true;\n  {{/if}}\n};\n{{/each}}\n\n\n{{#each tableModules}}\nexport type {{toCodeTypeName this.name}}__Descriptor = {\n  row: {{toCodeTypeName this.name}};\n  {{#if (filterRefColumn this.columns)}}\n  refs: {\n    {{#each (filterRefColumn this.columns)}}\n    {{includeName this}}: {{{includeType this}}};\n    {{/each}}\n  }\n  {{/if}}\n  {{#unless (filterRefColumn this.columns)}}\n  refs: object;\n  {{/unless}}\n  unique:[]\n};\n{{/each}}\n\n\n// Webhook types\nexport type WebhookEvent = "content.create" | "content.update" | "content.delete";\nexport type WebhookPayload = {\n  event: WebhookEvent;\n  timestamp: string;\n  project: string;\n} & (\n  {{#each tables}}\n  | {\n      table: "{{this.name}}";\n      content: {{toCodeTypeName this.name}};\n      old?: {{toCodeTypeName this.name}};\n    }\n  {{/each}}\n)\n';
+var types_ts_default2 = '//  This file was automatically generated and should not be edited.\n\nimport { FormValidationRules, StorageItemType } from "@orizm/common";\n\n// Utilities\ntype _ModuleRef<T> = T & _ModuleDescriptor;\ntype _ModuleDescriptor = {\n    isModule: true;\n};\ntype _ArrayModuleRef<T> = T & _ArrayModuleDescriptor;\ntype _ArrayModuleDescriptor = {\n    isModuleArray: true;\n};\n\n\n// Tables\n{{#each tables}}\nexport type {{toCodeTypeName this.name}} = {\n  id: string;\n  createdAt: string;\n  updatedAt: string;\n  group?: string;\n  publishedAt?: string;\n  _draft?: boolean;\n  _published?: boolean;\n  {{#each this.columns}}\n  {{this.name}}{{#unless this.required}}?{{/unless}}: {{typeName this}};\n  {{/each}}\n  {{#if this.enableForm}}\n  formSchema: FormValidationRules;\n  {{/if}}\n}\n\n{{/each}}\n\n{{#each tableModules}}\nexport type {{toCodeTypeName this.name}} = {\n  {{#each this.columns}}\n  {{this.name}}{{#unless this.required}}?{{/unless}}: {{typeName this}};\n  {{/each}}\n};\n{{/each}}\n\n// Descriptor types\n{{#each tables}}\nexport type {{toCodeTypeName this.name}}__Descriptor = {\n  row: {{toCodeTypeName this.name}};\n  {{#if (filterRefColumn this.columns)}}\n  refs: {\n    {{#each (filterRefColumn this.columns)}}\n    {{includeName this}}: {{{includeType this}}};\n    {{/each}}\n  }\n  {{/if}}\n  {{#unless (filterRefColumn this.columns)}}\n  refs: object;\n  {{/unless}}\n  {{#if (filterUniqueIndexes this.indexes)}}\n  unique: [\n    {{#each (filterUniqueIndexes this.indexes)}}\n      { {{#each (getIndexColumns ../this this)}}{{this.name}}:{{typeName this}},{{/each}} },\n    {{/each}}\n  ]\n  {{/if}}\n  {{#unless (filterUniqueIndexes this.indexes)}}\n  unique: [];\n  {{/unless}}\n  {{#if this.enableDrafts}}\n  enableDrafts: true;\n  {{/if}}\n};\n{{/each}}\n\n\n{{#each tableModules}}\nexport type {{toCodeTypeName this.name}}__Descriptor = {\n  row: {{toCodeTypeName this.name}};\n  {{#if (filterRefColumn this.columns)}}\n  refs: {\n    {{#each (filterRefColumn this.columns)}}\n    {{includeName this}}: {{{includeType this}}};\n    {{/each}}\n  }\n  {{/if}}\n  {{#unless (filterRefColumn this.columns)}}\n  refs: object;\n  {{/unless}}\n  unique:[]\n};\n{{/each}}\n\n\n// Webhook types\nexport type WebhookEvent = "content.create" | "content.update" | "content.delete";\ntype WebhookPayloadBase = {\n  event: WebhookEvent;\n  timestamp: string;\n  project: string;\n};\n{{#if tables}}\nexport type WebhookPayload = WebhookPayloadBase & (\n  {{#each tables}}\n  | {\n      table: "{{this.name}}";\n      content: {{toCodeTypeName this.name}};\n      old?: {{toCodeTypeName this.name}};\n    }\n  {{/each}}\n);\n{{else}}\nexport type WebhookPayload = WebhookPayloadBase;\n{{/if}}\n';
 
 // src/consumer/pull/generate.ts
 async function generate2(options) {
@@ -440,11 +942,14 @@ Handlebars2.registerHelper("typeName", (column) => {
     return column.type;
   }
 });
-Handlebars2.registerHelper("filterRefColumn", (columns) => {
-  return (columns || []).filter(
-    (c) => c.type === "reference" && c.tableName && c.includeName || c.type === "module" && c.moduleName || c.type === "module-array" && c.moduleName
-  );
-});
+Handlebars2.registerHelper(
+  "filterRefColumn",
+  (columns) => {
+    return (columns || []).filter(
+      (c) => c.type === "reference" && c.tableName && c.includeName || c.type === "module" && c.moduleName || c.type === "module-array" && c.moduleName
+    );
+  }
+);
 Handlebars2.registerHelper("includeName", (column) => {
   return column.type === "reference" ? column.includeName : column.name;
 });
@@ -488,9 +993,9 @@ async function renderClient2(config, output) {
 // src/consumer/generate/action.ts
 var spinner3 = createSpinner();
 async function generateAction(orizmConfigTs, destination) {
-  spinner3.start("Loading project schema...");
+  spinner3.start("Loading project config...");
   const definition = await loadConfig(orizmConfigTs);
-  spinner3.succeed("Loaded project schema.");
+  spinner3.succeed("Loaded project config.");
   spinner3.start("Generating code...");
   await generate2({
     definition,
@@ -517,16 +1022,16 @@ async function pullAction2(options) {
   spinner4.start("Loading environment variables...");
   const config = await loadEnv(options.envPath);
   spinner4.succeed("Loaded environment variables.");
-  spinner4.start("Loading project schema...");
-  const definition = await fetchDefinitionReference({
+  spinner4.start("Loading project config...");
+  const definition = await fetchCurrentDefinition({
     baseUrl: config.ORIZM_BASE_URL,
     apiKey: config.ORIZM_API_KEY,
     projectName: config.ORIZM_PROJECT
   });
-  spinner4.succeed("Loaded project schema.");
+  spinner4.succeed("Loaded project config.");
   spinner4.start("Generating code...");
   await generate2({
-    definition,
+    definition: definition.parsed,
     output: options.destination
   });
   spinner4.succeed(`Generated code to '${options.destination}'`);
@@ -546,18 +1051,19 @@ var consumerPullCommand = new Command4("pull").description("pull orizm schema an
 
 // src/push/command.ts
 import { Command as Command5 } from "commander";
-import cliColor4 from "cli-color";
+import cliColor5 from "cli-color";
 
 // src/lib/developer-api.ts
 async function applyDefinition(env, projectDef) {
-  const client = createDeveloperAPIClient(
-    env.ORIZM_BASE_URL,
-    env.ORIZM_API_KEY
-  );
+  const client = createDeveloperAPIv2Client({
+    serverOrigin: env.ORIZM_BASE_URL,
+    headers: {
+      "x-api-key": env.ORIZM_API_KEY
+    }
+  });
   const response = await client.POST("/projects/{projectName}/definitions", {
     params: { path: { projectName: env.ORIZM_PROJECT } },
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    body: { apply: true, project: projectDef }
+    body: { definition: projectDef }
   });
   if (!response.data) {
     const status = response.response.status;
@@ -572,16 +1078,17 @@ async function applyDefinition(env, projectDef) {
   }
 }
 var getChangeEvents = async (env, projectDef) => {
-  const client = createDeveloperAPIClient(
-    env.ORIZM_BASE_URL,
-    env.ORIZM_API_KEY
-  );
+  const client = createDeveloperAPIv2Client({
+    serverOrigin: env.ORIZM_BASE_URL,
+    headers: {
+      "x-api-key": env.ORIZM_API_KEY
+    }
+  });
   const response = await client.POST(
     "/projects/{projectName}/definitions/dry-run",
     {
       params: { path: { projectName: env.ORIZM_PROJECT } },
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      body: { project: projectDef }
+      body: { definition: projectDef }
     }
   );
   if (!response.data) {
@@ -592,14 +1099,15 @@ var getChangeEvents = async (env, projectDef) => {
       );
     }
     throw new Error(
-      `${status} ${response.response.statusText}: Unexpected error occurred while fetching schema change events.`
+      `${status} ${response.response.statusText}: Unexpected error occurred while fetching schema change events.
+      ${JSON.stringify(response.error, null, 2)}`
     );
   }
   return response.data;
 };
 
 // src/lib/display-change-events.ts
-import cliColor3 from "cli-color";
+import cliColor4 from "cli-color";
 
 // src/lib/cli-table.ts
 var COLORS = {
@@ -708,7 +1216,7 @@ async function displayChangeEvents(changeEvents) {
   } = changeEvents;
   if (tableChangeEvents.length === 0 && bucketChangeEvents.length === 0 && authorityChangeEvents.length === 0) {
     console.log();
-    console.log(cliColor3.green("No changes."));
+    console.log(cliColor4.green("No changes."));
     return;
   }
   displayTableChangeEvents(tableChangeEvents);
@@ -965,9 +1473,9 @@ var pushCommand = new Command5("push").description("apply schema to project.").o
     spinner5.start("Loading environment variables...");
     const env = await loadEnv(options.env);
     spinner5.succeed("Loaded environment variables.");
-    spinner5.start("Loading project schema...");
+    spinner5.start("Loading project config...");
     const projectDef = await loadConfig(options.config);
-    spinner5.succeed("Loaded project schema.");
+    spinner5.succeed("Loaded project config.");
     spinner5.start("Fetch schema change events...");
     const changeEvents = await getChangeEvents(env, projectDef);
     spinner5.succeed("Fetch schema change events.");
@@ -981,7 +1489,7 @@ var pushCommand = new Command5("push").description("apply schema to project.").o
     if (!options.yes) {
       const confirm = await input("Do you want to apply schema? (y/N): ");
       if (confirm !== "y") {
-        console.log(cliColor4.red("Canceled."));
+        console.log(cliColor5.red("Canceled."));
         return;
       }
     }
@@ -993,17 +1501,202 @@ var pushCommand = new Command5("push").description("apply schema to project.").o
   }
 });
 
+// src/config/validate/command.ts
+import { Command as Command6 } from "commander";
+import clc from "cli-color";
+import * as v5 from "valibot";
+
+// src/config/validate/watcher.ts
+import chokidar from "chokidar";
+function watchConfigFile(configPath, onFileChange) {
+  const watcher = chokidar.watch(configPath, {
+    persistent: true,
+    ignoreInitial: true
+  });
+  let isProcessing = false;
+  let timeoutId = null;
+  const debouncedOnChange = async () => {
+    if (isProcessing) return;
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
+    timeoutId = setTimeout(async () => {
+      isProcessing = true;
+      try {
+        await onFileChange();
+      } catch (error2) {
+        handleError(error2);
+      } finally {
+        isProcessing = false;
+      }
+    }, 300);
+  };
+  watcher.on("change", debouncedOnChange);
+  watcher.on("add", debouncedOnChange);
+  watcher.on("unlink", debouncedOnChange);
+  const terminate = () => {
+    watcher.close();
+    process.exit(0);
+  };
+  process.on("SIGINT", terminate);
+  process.on("SIGTERM", terminate);
+  watcher.on("error", (error2) => {
+    handleError(error2);
+  });
+  return watcher;
+}
+
+// src/config/validate/command.ts
+var validateConfigCommand = new Command6("validate").description("validate orizm.config.ts for validation errors").option("-c, --config <path>", "Path to config file", "./orizm.config.ts").option("-w, --watch", "Watch for file changes and re-validate").action(async (options) => {
+  try {
+    const validateConfig = async () => {
+      try {
+        if (options.watch) {
+          console.clear();
+          console.log(
+            `\u{1F440} Watching ${options.config} for changes... (Press Ctrl+C to stop)`
+          );
+          console.log();
+        }
+        await loadConfig(options.config);
+        console.log(clc.green("\u2705 Config is valid."));
+      } catch (error2) {
+        if (v5.isValiError(error2)) {
+          console.error(clc.red("\u274C Config validation failed:"));
+          displayValibotError(error2);
+          return;
+        }
+        throw error2;
+      }
+    };
+    await validateConfig();
+    if (options.watch) {
+      watchConfigFile(options.config, validateConfig);
+    }
+  } catch (error2) {
+    handleError(error2);
+  }
+});
+
+// src/config/generate-erd/command.ts
+import { Command as Command7 } from "commander";
+
+// src/config/generate-erd/generate.ts
+import Handlebars3 from "handlebars";
+
+// src/config/generate-erd/mermaid-erd.hbr
+var mermaid_erd_default = "generated by @orizm/cli\n\n```mermaid\nerDiagram\n{{#each tables}}\n    {{name}} {\n        id string PK\n{{#each columns}}\n        {{name}} {{type}}{{#if isForeignKey}} FK{{/if}}\n{{/each}}\n    }\n{{/each}}\n\n{{#each relations}}\n    {{from}} {{type}} {{to}} : {{comment}}\n{{/each}}\n```";
+
+// src/config/generate-erd/generate.ts
+function generate3(input2) {
+  const template = Handlebars3.compile(mermaid_erd_default);
+  return template(input2);
+}
+
+// src/config/generate-erd/convert-to-input.ts
+function convertToInput(config) {
+  if (!config.tables) {
+    return {
+      tables: [],
+      relations: []
+    };
+  }
+  const tables = [];
+  const relations = [];
+  for (const table of config.tables) {
+    const modules = [];
+    const erdTable = {
+      name: table.name,
+      columns: []
+    };
+    for (const column of table.columns) {
+      erdTable.columns.push({
+        name: column.name,
+        type: column.type,
+        isForeignKey: column.type === "reference"
+      });
+      if (column.type === "reference") {
+        relations.push({
+          from: column.tableName,
+          to: table.name,
+          type: RELATION.ONE_TO_MANY,
+          comment: "reference"
+        });
+      }
+      if (column.type === "module" || column.type === "module-array") {
+        const module = config.tableModules?.find(
+          (m) => m.name === column.moduleName
+        );
+        if (!module) {
+          continue;
+        }
+        const moduleTableName = `${table.name}_${column.name}_${column.moduleName}`;
+        modules.push({
+          name: moduleTableName,
+          columns: module?.columns.map((c) => ({
+            name: c.name,
+            type: c.type,
+            isForeignKey: c.type === "reference"
+          })) || []
+        });
+        relations.push({
+          from: table.name,
+          to: moduleTableName,
+          type: column.type === "module" ? RELATION.ONE_TO_ONE : RELATION.ONE_TO_MANY,
+          comment: column.type === "module" ? "module" : "module-array"
+        });
+        for (const moduleColumn of module.columns) {
+          if (moduleColumn.type === "reference" && moduleColumn.tableName) {
+            relations.push({
+              from: moduleTableName,
+              to: moduleColumn.tableName,
+              type: RELATION.ONE_TO_MANY,
+              comment: "reference"
+            });
+          }
+        }
+      }
+    }
+    tables.push(erdTable);
+    tables.push(...modules);
+  }
+  return {
+    tables,
+    relations
+  };
+}
+var RELATION = {
+  ONE_TO_MANY: "||--o{",
+  ONE_TO_ONE: "||--||"
+};
+
+// src/config/generate-erd/command.ts
+var generateErdCommand = new Command7("generate-erd").description("generate er diagram in mermaid format from orizm.config.ts").option("-c, --config <path>", "orizm config file path.", "orizm.config.ts").action(async (options) => {
+  try {
+    const config = await loadConfig(options.config);
+    const input2 = convertToInput(config);
+    const mermaidText = generate3(input2);
+    console.log(mermaidText);
+  } catch (error2) {
+    handleError(error2);
+  }
+});
+
 // src/cli.ts
 program.name("orizm CLI");
 program.addCommand(pushCommand);
-var cmsCommands = new Command6("cms").description("cms commands.");
+var cmsCommands = new Command8("cms").description("cms commands.");
 cmsCommands.addCommand(cmsGenerateCommand);
 cmsCommands.addCommand(cmsPullCommand);
 program.addCommand(cmsCommands);
-var consumerCommands = new Command6("consumer").description(
+var consumerCommands = new Command8("consumer").description(
   "consumer commands."
 );
 consumerCommands.addCommand(consumerGenerateCommand);
 consumerCommands.addCommand(consumerPullCommand);
 program.addCommand(consumerCommands);
+var configCommands = new Command8("config").description("config commands.");
+configCommands.addCommand(validateConfigCommand);
+configCommands.addCommand(generateErdCommand);
+program.addCommand(configCommands);
 program.parse();