@orizm/cli 2.2.1 → 2.2.3

package/dist/cli.cjs

@@ -38,7 +38,7 @@ async function loadConfig(configFile) {
     bundle: true,
     write: false,
     format: "esm",
-    target: "node16",
+    target: "node22",
     platform: "node"
   });
   const moduleURL = `data:text/javascript,${encodeURIComponent(
@@ -52,9 +52,9 @@ async function loadConfig(configFile) {
 var import_readline = __toESM(require("readline"), 1);
 
 // src/lib/cli-symbol.ts
-var import_cli_color = __toESM(require("cli-color"), 1);
-var success = import_cli_color.default.green("\u2713");
-var error = import_cli_color.default.red("\u2717");
+var import_chalk = __toESM(require("chalk"), 1);
+var success = import_chalk.default.green("\u2713");
+var error = import_chalk.default.red("\u2717");
 
 // src/lib/cli-cursor.ts
 function hide() {
@@ -121,11 +121,11 @@ function createSpinner() {
 
 // src/lib/handle-error.ts
 var v3 = __toESM(require("valibot"), 1);
-var import_cli_color3 = __toESM(require("cli-color"), 1);
+var import_chalk3 = __toESM(require("chalk"), 1);
 
 // src/lib/display-valibot-error.ts
 var v2 = __toESM(require("valibot"), 1);
-var import_cli_color2 = __toESM(require("cli-color"), 1);
+var import_chalk2 = __toESM(require("chalk"), 1);
 function displayValibotError(error2) {
   if (!v2.isValiError(error2)) {
     return;
@@ -141,10 +141,10 @@ function buildValiErrorMessage(e, options) {
   }).join("\n");
 }
 function getIssueMessage(message, color) {
-  return color ? import_cli_color2.default.red(message) : message;
+  return color ? import_chalk2.default.red(message) : message;
 }
 function getLocationPath(path3, color) {
-  return color ? import_cli_color2.default.yellow(path3) : path3;
+  return color ? import_chalk2.default.yellow(path3) : path3;
 }
 function getPath(issue) {
   const issueDotPath = v2.getDotPath(issue);
@@ -188,7 +188,7 @@ function handleError(error2) {
   }
   console.error();
   console.error(
-    import_cli_color3.default.red(
+    import_chalk3.default.red(
       "Something went wrong. Please check the error below for more details."
     )
   );
@@ -201,13 +201,6 @@ function handleError(error2) {
 // src/cms/generate/generator.ts
 var import_promises = require("fs/promises");
 var import_path = __toESM(require("path"), 1);
-var import_handlebars = __toESM(require("handlebars"), 1);
-
-// 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/cms-sdk/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 | null;\n  publishedAt: string | null;\n  _draft: boolean | null;\n  _published: boolean | null;\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}}: {{typeName this}}{{#unless this.required}}{{#if_equal this.type "module-array"}}{{else}} | null{{/if_equal}}{{/unless}};\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 | null;\n  publishedAt?: string | null;\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 "CreateInput"}}{{#unless this.required}}{{#if_equal this.type "module-array"}}{{else}} | null{{/if_equal}}{{/unless}};\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 "UpdateInput"}}{{#unless this.required}}{{#if_equal this.type "module-array"}}{{else}} | null{{/if_equal}}{{/unless}};{{/unless}}\n  {{/each}}\n  {{#unless this.isSubmissions}}\n  publishedAt?: string | null;\n  scheduledPublishAt?: string | null;\n  scheduledUnpublishAt?: string | null;\n  createdAt?: string;\n  {{/unless}}\n  {{#if this.enableForm}}\n  formSchema: FormValidationRules;\n  {{/if}}\n};\n\n{{/each}}\n\n\n// Module types\n{{#each tableModules}}\nexport type {{toCodeTypeName this.name}} = {\n  id: string;\n  {{#each this.columns}}\n  {{this.name}}: {{typeName this}}{{#unless this.required}}{{#if_equal this.type "module-array"}}{{else}} | null{{/if_equal}}{{/unless}};\n  {{/each}}\n};\n\nexport type {{toCodeTypeName this.name}}CreateInput = {\n  {{#each this.columns}}\n  {{this.name}}{{#unless this.required}}?{{/unless}}: {{typeName this "CreateInput"}}{{#unless this.required}}{{#if_equal this.type "module-array"}}{{else}} | null{{/if_equal}}{{/unless}};\n  {{/each}}\n};\n\nexport type {{toCodeTypeName this.name}}UpdateInput = {\n  id?: string;\n  {{#each this.columns}}\n  {{this.name}}{{#unless this.required}}?{{/unless}}: {{typeName this}}{{#unless this.required}}{{#if_equal this.type "module-array"}}{{else}} | null{{/if_equal}}{{/unless}};\n  {{/each}}\n};\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}}{{#unless this.required}}{{#if ../this.nullsNotDistinct}} | null{{/if}}{{/unless}},{{/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\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";\n\ntype WebhookPayloadBase = {\n  event: WebhookEvent;\n  timestamp: string;\n  project: string;\n};\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';
 
 // src/lib/format-ts-with-prettier.ts
 var prettier = __toESM(require("prettier/standalone"), 1);
@@ -220,83 +213,150 @@ function formatTsWithPrettier(code) {
   });
 }
 
-// src/cms/generate/generator.ts
-var Handlebars = import_handlebars.default.create();
-Handlebars.registerHelper("toEndpointName", (str) => {
-  return str;
-});
+// src/lib/render-helpers.ts
 function toCodeTypeName(str) {
   str = str.charAt(0).toUpperCase() + str.slice(1);
   return str.replace(/_([a-z])/g, (g) => g[1].toUpperCase());
 }
-Handlebars.registerHelper("toCodeTypeName", toCodeTypeName);
-Handlebars.registerHelper(
-  "typeName",
-  (column, _moduleSuffix) => {
-    const moduleSuffix = typeof _moduleSuffix === "string" ? _moduleSuffix : "";
-    if (column.type === "reference") {
+function typeName(column, moduleSuffix = "") {
+  switch (column.type) {
+    case "reference":
       return "string";
-    } else if (column.type === "module") {
-      return toCodeTypeName(column.moduleName) + moduleSuffix;
-    } else if (column.type === "module-array") {
-      return toCodeTypeName(column.moduleName) + moduleSuffix + "[]";
-    } else if (column.type === "json") {
+    case "module":
+      return toCodeTypeName(column.moduleName ?? "") + moduleSuffix;
+    case "module-array":
+      return toCodeTypeName(column.moduleName ?? "") + moduleSuffix + "[]";
+    case "json":
       return "unknown";
-    } else if (column.type === "storage") {
+    case "storage":
       return "StorageItemType";
-    } else {
+    default:
       return column.type;
-    }
   }
-);
-Handlebars.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
-    );
-  }
-);
-Handlebars.registerHelper(
-  "includeName",
-  (column) => {
-    return column.type === "reference" ? column.includeName : column.name;
+}
+function nullableSuffix(column) {
+  return !column.required && column.type !== "module-array" ? " | null" : "";
+}
+function filterRefColumns(columns) {
+  return columns.filter(
+    (c) => c.type === "reference" && c.tableName !== void 0 && c.includeName !== void 0 && c.includeName !== "" || c.type === "module" && c.moduleName !== void 0 || c.type === "module-array" && c.moduleName !== void 0
+  );
+}
+function getIncludeName(column) {
+  return column.type === "reference" ? column.includeName || column.name : column.name;
+}
+function getIncludeType(column) {
+  if (column.type === "reference" && column.tableName) {
+    return toCodeTypeName(column.tableName) + "__Descriptor";
   }
-);
-Handlebars.registerHelper(
-  "includeType",
-  (column) => {
-    if (column.type === "reference")
-      return toCodeTypeName(column.tableName) + "__Descriptor";
-    if (column.type === "module")
-      return `_ModuleRef<${toCodeTypeName(column.moduleName)}__Descriptor>`;
-    if (column.type === "module-array")
-      return `_ArrayModuleRef<${toCodeTypeName(
-        column.moduleName
-      )}__Descriptor>`;
+  if (column.type === "module" && column.moduleName) {
+    return `_ModuleRef<${toCodeTypeName(column.moduleName)}__Descriptor>`;
   }
-);
-Handlebars.registerHelper(
-  "filterUniqueIndexes",
-  (indexes) => {
-    return (indexes ?? []).filter((i) => i.unique);
+  if (column.type === "module-array" && column.moduleName) {
+    return `_ArrayModuleRef<${toCodeTypeName(column.moduleName)}__Descriptor>`;
   }
-);
-Handlebars.registerHelper(
-  "getIndexColumns",
-  (table, index) => {
-    return index.columns.map((i) => {
-      const column = table.columns.find((c) => c.name === i);
-      if (!column) {
-        throw new Error(`column ${i} not found`);
-      }
-      return column;
+  return "";
+}
+function renderColumnField(col, options) {
+  const optional2 = options?.optional === true ? "?" : "";
+  const suffix = options?.suffix ?? "";
+  return `${col.name}${optional2}: ${typeName(col, suffix)}${nullableSuffix(col)};`;
+}
+function renderTypeBlock(name, fields) {
+  return `export type ${name} = {
+${fields.join("\n")}
+};`;
+}
+function renderRefsFieldLines(columns) {
+  const refCols = filterRefColumns(columns);
+  if (refCols.length === 0) return ["refs: object;"];
+  return [
+    "refs: {",
+    ...refCols.map((c) => `${getIncludeName(c)}: ${getIncludeType(c)};`),
+    "}"
+  ];
+}
+function renderUniqueFieldLines(table) {
+  const uniqueIndexes = (table.indexes ?? []).filter((i) => i.unique);
+  if (uniqueIndexes.length === 0) return ["unique: [];"];
+  const entries = uniqueIndexes.map((index) => {
+    const cols = index.columns.map((colName) => {
+      const col = table.columns.find((c) => c.name === colName);
+      if (!col) throw new Error(`column ${colName} not found`);
+      const nullable = !col.required && index.nullsNotDistinct ? " | null" : "";
+      return `${col.name}:${typeName(col)}${nullable},`;
     });
+    return `{ ${cols.join("")} },`;
+  });
+  return ["unique: [", ...entries, "]"];
+}
+function renderModuleRowTypeBlock(mod) {
+  return renderTypeBlock(toCodeTypeName(mod.name), [
+    "id: string;",
+    ...mod.columns.map((col) => renderColumnField(col))
+  ]);
+}
+function renderModuleDescriptorBlock(mod) {
+  const name = toCodeTypeName(mod.name);
+  return renderTypeBlock(`${name}__Descriptor`, [
+    `row: ${name};`,
+    ...renderRefsFieldLines(mod.columns),
+    "unique: [];"
+  ]);
+}
+function renderPreamble(importFrom) {
+  return `//  This file was automatically generated and should not be edited.
+
+import { FormValidationRules, StorageItemType } from "${importFrom}";
+
+// Utilities
+type _ModuleRef<T> = T & _ModuleDescriptor;
+type _ModuleDescriptor = {
+    isModule: true;
+};
+type _ArrayModuleRef<T> = T & _ArrayModuleDescriptor;
+type _ArrayModuleDescriptor = {
+    isModuleArray: true;
+};`;
+}
+function renderSection(title, blocks) {
+  if (blocks.length === 0) return "";
+  return `// ${title}
+${blocks.join("\n\n")}`;
+}
+function renderWebhookTypesSection(tables) {
+  const lines = [
+    "// Webhook types",
+    'export type WebhookEvent = "content.create" | "content.update" | "content.delete";',
+    "",
+    "type WebhookPayloadBase = {",
+    "  event: WebhookEvent;",
+    "  timestamp: string;",
+    "  project: string;",
+    "};",
+    ""
+  ];
+  if (tables.length > 0) {
+    const unionMembers = tables.map((t) => {
+      const name = toCodeTypeName(t.name);
+      return `| {
+  table: "${t.name}";
+  content: ${name};
+  old?: ${name};
+}`;
+    }).join("\n");
+    lines.push(
+      `export type WebhookPayload = WebhookPayloadBase & (
+${unionMembers}
+);`
+    );
+  } else {
+    lines.push("export type WebhookPayload = WebhookPayloadBase;");
   }
-);
-Handlebars.registerHelper("if_equal", function(a, b, options) {
-  return a === b ? options.fn(this) : options.inverse(this);
-});
+  return lines.join("\n");
+}
+
+// src/cms/generate/generator.ts
 async function generate(options) {
   const config = options.config;
   await (0, import_promises.mkdir)(options.output, { recursive: true });
@@ -316,19 +376,143 @@ async function generate(options) {
 async function renderTypes(config) {
   const submissionTables = config.tables.filter((t) => t.enableForm).map((t) => ({
     name: t.name + "__submission",
-    columns: t.formOptions?.submissionColumns || [],
+    columns: t.formOptions?.submissionColumns ?? [],
     isSubmissions: true
   }));
-  const renderParams = {
-    ...config,
-    tables: [...config.tables, ...submissionTables]
-  };
-  return await formatTsWithPrettier(
-    Handlebars.compile(types_ts_default)(renderParams)
-  );
+  const allTables = [...config.tables, ...submissionTables];
+  const modules = config.tableModules ?? [];
+  const source = [
+    renderPreamble("@orizm/cms-sdk/common"),
+    renderSection("Tables", allTables.map(renderTableTypes)),
+    renderSection("Module types", modules.map(renderModuleTypes)),
+    // CMS: モジュール descriptor 間は空行なし（スナップショット互換）
+    "// Descriptor types\n" + [
+      ...allTables.map(renderTableDescriptor),
+      modules.map(renderModuleDescriptorBlock).join("\n")
+    ].join("\n\n"),
+    renderWebhookTypesSection(allTables)
+  ].filter(Boolean).join("\n\n\n");
+  return await formatTsWithPrettier(source);
+}
+function renderTableTypes(table) {
+  const cols = table.columns;
+  const name = toCodeTypeName(table.name);
+  const rowType = renderTypeBlock(name, [
+    "id: string;",
+    "createdAt: string;",
+    "updatedAt: string;",
+    ...!table.isSubmissions ? [
+      "group: string | null;",
+      "publishedAt: string | null;",
+      "_draft: boolean | null;",
+      "_published: boolean | null;",
+      "scheduledPublishAt: string | null;",
+      "scheduledUnpublishAt: string | null;"
+    ] : [
+      "_formId: string;",
+      "_content: unknown;",
+      "_formSchema: unknown;",
+      "_attachments: StorageItemType[];"
+    ],
+    ...cols.map((col) => renderColumnField(col)),
+    ...table.enableForm ? ["formSchema: FormValidationRules;"] : []
+  ]);
+  const createType = renderTypeBlock(`${name}CreateInput`, [
+    ...!table.isSubmissions ? [
+      "group?: string | null;",
+      "publishedAt?: string | null;",
+      "scheduledPublishAt?: string | null;",
+      "scheduledUnpublishAt?: string | null;",
+      "createdAt?: string;"
+    ] : [],
+    ...cols.map(
+      (col) => renderColumnField(col, {
+        optional: !col.required,
+        suffix: "CreateInput"
+      })
+    ),
+    ...table.enableForm ? ["formSchema: FormValidationRules;"] : []
+  ]);
+  const updateType = renderTypeBlock(`${name}UpdateInput`, [
+    ...cols.filter((col) => !col.readOnly).map(
+      (col) => renderColumnField(col, { optional: true, suffix: "UpdateInput" })
+    ),
+    ...!table.isSubmissions ? [
+      "publishedAt?: string | null;",
+      "scheduledPublishAt?: string | null;",
+      "scheduledUnpublishAt?: string | null;",
+      "createdAt?: string;"
+    ] : [],
+    ...table.enableForm ? ["formSchema: FormValidationRules;"] : []
+  ]);
+  return [rowType, createType, updateType].join("\n\n");
+}
+function renderModuleTypes(mod) {
+  const name = toCodeTypeName(mod.name);
+  const cols = mod.columns;
+  const rowType = renderModuleRowTypeBlock(mod);
+  const createType = renderTypeBlock(`${name}CreateInput`, [
+    ...cols.map(
+      (col) => renderColumnField(col, {
+        optional: !col.required,
+        suffix: "CreateInput"
+      })
+    )
+  ]);
+  const updateType = renderTypeBlock(`${name}UpdateInput`, [
+    "id?: string;",
+    ...cols.map((col) => renderColumnField(col, { optional: !col.required }))
+  ]);
+  return [rowType, createType, updateType].join("\n\n");
+}
+function renderTableDescriptor(table) {
+  const name = toCodeTypeName(table.name);
+  return renderTypeBlock(`${name}__Descriptor`, [
+    `row: ${name};`,
+    `create: ${name}CreateInput;`,
+    `update: ${name}UpdateInput;`,
+    ...renderRefsFieldLines(table.columns),
+    ...renderUniqueFieldLines(table),
+    ...table.enableDrafts ? ["enableDrafts: true;"] : [],
+    ...table.enableForm ? [`submissionDescriptor: ${name}_Submission__Descriptor;`] : ["submissionDescriptor: never;"]
+  ]);
 }
 async function renderClient(config) {
-  return await formatTsWithPrettier(Handlebars.compile(client_ts_default)(config));
+  const tableEntries = config.tables.map(
+    (t) => `${t.name}: this.client.getTableClient<Models.${toCodeTypeName(t.name)}__Descriptor>("${t.name}"),`
+  ).join("\n");
+  const bucketEntries = (config.buckets ?? []).map((b) => `${b.name}: this.client.getBucketClient("${b.name}"),`).join("\n");
+  const source = `//  This file was automatically generated and should not be edited.
+
+import { OrizmCMSClient } from "@orizm/cms-sdk";
+
+import * as Models from "./types";
+
+export class CMSClient {
+  constructor(protected client: OrizmCMSClient) {
+    this.tables = {
+      ${tableEntries}
+    };
+
+    this.buckets = {
+      ${bucketEntries}
+    };
+
+    this.userManagement = this.client.userManagement;
+
+    this.userinfo = this.client.userinfo;
+
+    this.auth = this.client.auth;
+  }
+
+  readonly tables;
+  readonly buckets;
+  readonly userManagement;
+  readonly userinfo;
+  readonly auth;
+}
+`;
+  return await formatTsWithPrettier(source);
 }
 
 // src/cms/generate/command.ts
@@ -360,7 +544,7 @@ function assertValidUrlOrigin(origin) {
   }
 }
 
-// ../../node_modules/.pnpm/openapi-fetch@0.13.5/node_modules/openapi-fetch/dist/index.js
+// ../../node_modules/.pnpm/openapi-fetch@0.17.0/node_modules/openapi-fetch/dist/index.mjs
 var PATH_PARAM_RE = /\{[^{}]+\}/g;
 var supportsRequestInitExt = () => {
   return typeof process === "object" && Number.parseInt(process?.versions?.node?.substring(0, 2)) >= 18 && process.versions.undici;
@@ -375,13 +559,14 @@ function createClient(clientOptions) {
     fetch: baseFetch = globalThis.fetch,
     querySerializer: globalQuerySerializer,
     bodySerializer: globalBodySerializer,
+    pathSerializer: globalPathSerializer,
     headers: baseHeaders,
     requestInitExt = void 0,
     ...baseOptions
   } = { ...clientOptions };
   requestInitExt = supportsRequestInitExt() ? requestInitExt : void 0;
   baseUrl = removeTrailingSlash(baseUrl);
-  const middlewares = [];
+  const globalMiddlewares = [];
   async function coreFetch(schemaPath, fetchOptions) {
     const {
       baseUrl: localBaseUrl,
@@ -392,11 +577,14 @@ function createClient(clientOptions) {
       parseAs = "json",
       querySerializer: requestQuerySerializer,
       bodySerializer = globalBodySerializer ?? defaultBodySerializer,
+      pathSerializer: requestPathSerializer,
       body,
+      middleware: requestMiddlewares = [],
       ...init
     } = fetchOptions || {};
+    let finalBaseUrl = baseUrl;
     if (localBaseUrl) {
-      baseUrl = removeTrailingSlash(localBaseUrl);
+      finalBaseUrl = removeTrailingSlash(localBaseUrl) ?? baseUrl;
     }
     let querySerializer = typeof globalQuerySerializer === "function" ? globalQuerySerializer : createQuerySerializer(globalQuerySerializer);
     if (requestQuerySerializer) {
@@ -405,40 +593,57 @@ function createClient(clientOptions) {
         ...requestQuerySerializer
       });
     }
-    const serializedBody = body === void 0 ? void 0 : bodySerializer(body);
-    const defaultHeaders = (
+    const pathSerializer = requestPathSerializer || globalPathSerializer || defaultPathSerializer;
+    const serializedBody = body === void 0 ? void 0 : bodySerializer(
+      body,
+      // Note: we declare mergeHeaders() both here and below because it’s a bit of a chicken-or-egg situation:
+      // bodySerializer() needs all headers so we aren’t dropping ones set by the user, however,
+      // the result of this ALSO sets the lowest-priority content-type header. So we re-merge below,
+      // setting the content-type at the very beginning to be overwritten.
+      // Lastly, based on the way headers work, it’s not a simple “present-or-not” check becauase null intentionally un-sets headers.
+      mergeHeaders(baseHeaders, headers, params.header)
+    );
+    const finalHeaders = mergeHeaders(
       // 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"
-      }
+      },
+      baseHeaders,
+      headers,
+      params.header
     );
+    const finalMiddlewares = [...globalMiddlewares, ...requestMiddlewares];
     const requestInit = {
       redirect: "follow",
       ...baseOptions,
       ...init,
       body: serializedBody,
-      headers: mergeHeaders(defaultHeaders, baseHeaders, headers, params.header)
+      headers: finalHeaders
     };
     let id;
     let options;
-    let request = new CustomRequest(createFinalURL(schemaPath, { baseUrl, params, querySerializer }), requestInit);
+    let request = new Request(
+      createFinalURL(schemaPath, { baseUrl: finalBaseUrl, params, querySerializer, pathSerializer }),
+      requestInit
+    );
     let response;
     for (const key in init) {
       if (!(key in request)) {
         request[key] = init[key];
       }
     }
-    if (middlewares.length) {
+    if (finalMiddlewares.length) {
       id = randomID();
       options = Object.freeze({
-        baseUrl,
+        baseUrl: finalBaseUrl,
         fetch,
         parseAs,
         querySerializer,
-        bodySerializer
+        bodySerializer,
+        pathSerializer
       });
-      for (const m of middlewares) {
+      for (const m of finalMiddlewares) {
         if (m && typeof m === "object" && typeof m.onRequest === "function") {
           const result = await m.onRequest({
             request,
@@ -448,7 +653,7 @@ function createClient(clientOptions) {
             id
           });
           if (result) {
-            if (result instanceof CustomRequest) {
+            if (result instanceof Request) {
               request = result;
             } else if (result instanceof Response) {
               response = result;
@@ -463,11 +668,11 @@ function createClient(clientOptions) {
     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];
+      } catch (error22) {
+        let errorAfterMiddleware = error22;
+        if (finalMiddlewares.length) {
+          for (let i = finalMiddlewares.length - 1; i >= 0; i--) {
+            const m = finalMiddlewares[i];
             if (m && typeof m === "object" && typeof m.onError === "function") {
               const result = await m.onError({
                 request,
@@ -496,9 +701,9 @@ function createClient(clientOptions) {
           throw errorAfterMiddleware;
         }
       }
-      if (middlewares.length) {
-        for (let i = middlewares.length - 1; i >= 0; i--) {
-          const m = middlewares[i];
+      if (finalMiddlewares.length) {
+        for (let i = finalMiddlewares.length - 1; i >= 0; i--) {
+          const m = finalMiddlewares[i];
           if (m && typeof m === "object" && typeof m.onResponse === "function") {
             const result = await m.onResponse({
               request,
@@ -518,14 +723,22 @@ function createClient(clientOptions) {
         }
       }
     }
-    if (response.status === 204 || response.headers.get("Content-Length") === "0") {
+    const contentLength = response.headers.get("Content-Length");
+    if (response.status === 204 || request.method === "HEAD" || contentLength === "0" && !response.headers.get("Transfer-Encoding")?.includes("chunked")) {
       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 };
+      const getResponseData = async () => {
+        if (parseAs === "stream") {
+          return response.body;
+        }
+        if (parseAs === "json" && !contentLength) {
+          const raw = await response.text();
+          return raw ? JSON.parse(raw) : void 0;
+        }
+        return await response[parseAs]();
+      };
+      return { data: await getResponseData(), response };
     }
     let error2 = await response.text();
     try {
@@ -579,15 +792,15 @@ function createClient(clientOptions) {
         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);
+        globalMiddlewares.push(m);
       }
     },
     /** Unregister middleware */
     eject(...middleware) {
       for (const m of middleware) {
-        const i = middlewares.indexOf(m);
+        const i = globalMiddlewares.indexOf(m);
         if (i !== -1) {
-          middlewares.splice(i, 1);
+          globalMiddlewares.splice(i, 1);
         }
       }
     }
@@ -753,16 +966,22 @@ function defaultPathSerializer(pathname, pathParams) {
   }
   return nextURL;
 }
-function defaultBodySerializer(body) {
+function defaultBodySerializer(body, headers) {
   if (body instanceof FormData) {
     return body;
   }
+  if (headers) {
+    const contentType = headers.get instanceof Function ? headers.get("Content-Type") ?? headers.get("content-type") : headers["Content-Type"] ?? headers["content-type"];
+    if (contentType === "application/x-www-form-urlencoded") {
+      return new URLSearchParams(body).toString();
+    }
+  }
   return JSON.stringify(body);
 }
 function createFinalURL(pathname, options) {
   let finalURL = `${options.baseUrl}${pathname}`;
   if (options.params?.path) {
-    finalURL = defaultPathSerializer(finalURL, options.params.path);
+    finalURL = options.pathSerializer(finalURL, options.params.path);
   }
   let search = options.querySerializer(options.params.query ?? {});
   if (search.startsWith("?")) {
@@ -950,16 +1169,6 @@ var import_commander3 = require("commander");
 // src/consumer/pull/generate.ts
 var import_promises3 = require("fs/promises");
 var import_path2 = __toESM(require("path"), 1);
-var import_handlebars2 = __toESM(require("handlebars"), 1);
-
-// src/consumer/templates/client.ts.hbr
-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/consumer-sdk/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 | null;\n  publishedAt: string | null;\n  _draft: boolean | null;\n  _published: boolean | null;\n  {{#each this.columns}}\n  {{this.name}}: {{typeName this}}{{#unless this.required}}{{#if_equal this.type "module-array"}}{{else}} | null{{/if_equal}}{{/unless}};\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  id: string;\n  {{#each this.columns}}\n  {{this.name}}: {{typeName this}}{{#unless this.required}}{{#if_equal this.type "module-array"}}{{else}} | null{{/if_equal}}{{/unless}};\n  {{/each}}\n};\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}}{{#unless this.required}}{{#if ../this.nullsNotDistinct}} | null{{/if}}{{/unless}},{{/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\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\n{{/each}}\n\n\n// Webhook types\nexport type WebhookEvent = "content.create" | "content.update" | "content.delete";\n\ntype WebhookPayloadBase = {\n  event: WebhookEvent;\n  timestamp: string;\n  project: string;\n};\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
-var Handlebars2 = import_handlebars2.default.create();
 async function generate2(options) {
   await (0, import_promises3.mkdir)(options.output, { recursive: true });
   const renderedTypes = await renderTypes2(options.definition);
@@ -969,80 +1178,63 @@ async function generate2(options) {
   const targetClientPath = import_path2.default.join(options.output, "client.ts");
   await (0, import_promises3.writeFile)(targetClientPath, renderedClient, "utf-8");
 }
-Handlebars2.registerHelper("toEndpointName", (str) => {
-  return str;
-});
-function toCodeTypeName2(str) {
-  str = str.charAt(0).toUpperCase() + str.slice(1);
-  return str.replace(/_([a-z])/g, (g) => g[1].toUpperCase());
-}
-Handlebars2.registerHelper("toCodeTypeName", toCodeTypeName2);
-Handlebars2.registerHelper("typeName", (column) => {
-  if (column.type === "reference") {
-    return "string";
-  } else if (column.type === "json") {
-    return "unknown";
-  } else if (column.type === "module") {
-    if (!column.moduleName) {
-      console.warn("moduleName is not defined", column.name);
-    }
-    return toCodeTypeName2(column.moduleName || "unknown");
-  } else if (column.type === "module-array") {
-    if (!column.moduleName) {
-      console.warn("moduleName is not defined", column.name);
-    }
-    return toCodeTypeName2(column.moduleName || "unknown") + "[]";
-  } else if (column.type === "storage") {
-    return "StorageItemType";
-  } else {
-    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("includeName", (column) => {
-  return column.type === "reference" ? column.includeName : column.name;
-});
-Handlebars2.registerHelper("includeType", (column) => {
-  if (column.type === "reference" && column.tableName)
-    return toCodeTypeName2(column.tableName) + "__Descriptor";
-  if (column.type === "module" && column.moduleName)
-    return `_ModuleRef<${toCodeTypeName2(column.moduleName)}__Descriptor>`;
-  if (column.type === "module-array" && column.moduleName)
-    return `_ArrayModuleRef<${toCodeTypeName2(column.moduleName)}__Descriptor>`;
-});
-Handlebars2.registerHelper(
-  "filterUniqueIndexes",
-  (indexes) => {
-    return (indexes ?? []).filter((i) => i.unique);
-  }
-);
-Handlebars2.registerHelper(
-  "getIndexColumns",
-  (table, index) => {
-    return index.columns.map((i) => {
-      const column = table.columns.find((c) => c.name === i);
-      if (!column) {
-        throw new Error(`column ${i} not found`);
-      }
-      return column;
-    });
-  }
-);
-Handlebars2.registerHelper("if_equal", function(a, b, options) {
-  return a === b ? options.fn(this) : options.inverse(this);
-});
 async function renderTypes2(config) {
-  return await formatTsWithPrettier(Handlebars2.compile(types_ts_default2)(config));
+  const tables = config.tables;
+  const modules = config.tableModules ?? [];
+  const source = [
+    renderPreamble("@orizm/consumer-sdk/common"),
+    renderSection("Tables", tables.map(renderTableRowType)),
+    modules.map(renderModuleRowTypeBlock).join("\n\n"),
+    renderSection("Descriptor types", [
+      ...tables.map(renderTableDescriptor2),
+      ...modules.map(renderModuleDescriptorBlock)
+    ]),
+    renderWebhookTypesSection(tables)
+  ].filter(Boolean).join("\n\n\n");
+  return await formatTsWithPrettier(source);
+}
+function renderTableRowType(table) {
+  return renderTypeBlock(toCodeTypeName(table.name), [
+    "id: string;",
+    "createdAt: string;",
+    "updatedAt: string;",
+    "group: string | null;",
+    "publishedAt: string | null;",
+    "_draft: boolean | null;",
+    "_published: boolean | null;",
+    ...table.columns.map((col) => renderColumnField(col)),
+    ...table.enableForm ? ["formSchema: FormValidationRules;"] : []
+  ]);
+}
+function renderTableDescriptor2(table) {
+  const name = toCodeTypeName(table.name);
+  return renderTypeBlock(`${name}__Descriptor`, [
+    `row: ${name};`,
+    ...renderRefsFieldLines(table.columns),
+    ...renderUniqueFieldLines(table),
+    ...table.enableDrafts ? ["enableDrafts: true;"] : []
+  ]);
 }
 async function renderClient2(config) {
-  return await formatTsWithPrettier(Handlebars2.compile(client_ts_default2)(config));
+  const tableEntries = config.tables.map(
+    (t) => `${t.name}: this.getTableClient<Models.${toCodeTypeName(t.name)}__Descriptor>("${t.name}"),`
+  ).join("\n");
+  const source = `//  This file was automatically generated and should not be edited.
+
+import { ConsumerClientOptions, OrizmConsumerClientBase } from "@orizm/consumer-sdk";
+import * as Models from "./types";
+
+export class OrizmClient extends OrizmConsumerClientBase {
+  constructor(options: ConsumerClientOptions) {
+    super(options);
+  }
+
+  readonly tables = {
+    ${tableEntries}
+  };
+}
+`;
+  return await formatTsWithPrettier(source);
 }
 
 // src/consumer/generate/action.ts
@@ -1106,10 +1298,10 @@ var consumerPullCommand = new import_commander4.Command("pull").description("pul
 
 // src/push/command.ts
 var import_commander5 = require("commander");
-var import_cli_color6 = __toESM(require("cli-color"), 1);
+var import_chalk6 = __toESM(require("chalk"), 1);
 
 // src/lib/developer-api.ts
-var import_cli_color4 = __toESM(require("cli-color"), 1);
+var import_chalk4 = __toESM(require("chalk"), 1);
 async function applyDefinition(env, projectDef) {
   const client = createDeveloperAPIv2Client({
     serverOrigin: env.ORIZM_BASE_URL,
@@ -1129,7 +1321,7 @@ async function applyDefinition(env, projectDef) {
       );
     }
     if (response.error.type === "bad-request") {
-      console.log(import_cli_color4.default.red(response.error.detail));
+      console.log(import_chalk4.default.red(response.error.detail));
       process.exit(1);
     }
     throw new Error(
@@ -1167,7 +1359,7 @@ var getChangeEvents = async (env, projectDef) => {
 };
 
 // src/lib/display-change-events.ts
-var import_cli_color5 = __toESM(require("cli-color"), 1);
+var import_chalk5 = __toESM(require("chalk"), 1);
 
 // src/lib/cli-table.ts
 var COLORS = {
@@ -1276,7 +1468,7 @@ function displayChangeEvents(changeEvents) {
   } = changeEvents;
   if (tableChangeEvents.length === 0 && bucketChangeEvents.length === 0 && authorityChangeEvents.length === 0) {
     console.log();
-    console.log(import_cli_color5.default.green("No changes."));
+    console.log(import_chalk5.default.green("No changes."));
     return;
   }
   displayTableChangeEvents(tableChangeEvents);
@@ -1562,7 +1754,7 @@ var pushCommand = new import_commander5.Command("push").description("apply schem
       if (!options.yes) {
         const confirm = await input("Do you want to apply schema? (y/N): ");
         if (confirm !== "y") {
-          console.log(import_cli_color6.default.red("Canceled."));
+          console.log(import_chalk6.default.red("Canceled."));
           return;
         }
       }
@@ -1577,7 +1769,7 @@ var pushCommand = new import_commander5.Command("push").description("apply schem
 
 // src/config/validate/command.ts
 var import_commander6 = require("commander");
-var import_cli_color7 = __toESM(require("cli-color"), 1);
+var import_chalk7 = __toESM(require("chalk"), 1);
 var v5 = __toESM(require("valibot"), 1);
 
 // src/config/validate/watcher.ts
@@ -1633,10 +1825,10 @@ var validateConfigCommand = new import_commander6.Command("validate").descriptio
           console.log();
         }
         await loadConfig(options.config);
-        console.log(import_cli_color7.default.green("\u2705 Config is valid."));
+        console.log(import_chalk7.default.green("\u2705 Config is valid."));
       } catch (error2) {
         if (v5.isValiError(error2)) {
-          console.error(import_cli_color7.default.red("\u274C Config validation failed:"));
+          console.error(import_chalk7.default.red("\u274C Config validation failed:"));
           displayValibotError(error2);
           return;
         }
@@ -1656,16 +1848,27 @@ var validateConfigCommand = new import_commander6.Command("validate").descriptio
 var import_commander7 = require("commander");
 
 // src/config/generate-erd/generate.ts
-var import_handlebars3 = __toESM(require("handlebars"), 1);
+function generate3(input2) {
+  const tables = input2.tables.map((table) => {
+    const columns = [
+      "        id string PK",
+      ...table.columns.map(
+        (col) => `        ${col.name} ${col.type}${col.isForeignKey ? " FK" : ""}`
+      )
+    ].join("\n");
+    return `    ${table.name} {
+${columns}
+    }`;
+  }).join("\n");
+  const relations = input2.relations.map((rel) => `    ${rel.from} ${rel.type} ${rel.to} : ${rel.comment}`).join("\n");
+  return `generated by @orizm/cli
 
-// 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```";
+\`\`\`mermaid
+erDiagram
+${tables}
 
-// src/config/generate-erd/generate.ts
-var Handlebars3 = import_handlebars3.default.create();
-function generate3(input2) {
-  const template = Handlebars3.compile(mermaid_erd_default);
-  return template(input2);
+${relations}
+\`\`\``;
 }
 
 // src/config/generate-erd/convert-to-input.ts