@orizm/cli 1.0.2 → 1.0.3

package/dist/cli.js

@@ -130,7 +130,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';
@@ -208,7 +208,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 +238,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 +254,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((v4) => encodeURIComponent(v4))).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 v4 of value) {
+    if (options.style === "simple" || options.style === "label") {
+      values.push(options.allowReserved === true ? v4 : encodeURIComponent(v4));
+    } else {
+      values.push(serializePrimitiveParam(name, v4, 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, v4] of iterator) {
+      if (v4 === null) {
+        finalHeaders.delete(k);
+      } else if (Array.isArray(v4)) {
+        for (const v22 of v4) {
+          finalHeaders.append(k, v22);
+        }
+      } else if (v4 !== void 0) {
+        finalHeaders.set(k, v4);
+      }
+    }
+  }
+  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.`);
@@ -365,7 +820,7 @@ async function pullAction(options) {
   const env = await loadEnv(options.envPath);
   spinner2.succeed("Loaded environment variables.");
   spinner2.start("Loading project schema...");
-  const definitionReference = await fetchDefinitionReference({
+  const definitionReference = await fetchCurrentDefinition({
     baseUrl: env.ORIZM_BASE_URL,
     apiKey: env.ORIZM_API_KEY,
     projectName: env.ORIZM_PROJECT
@@ -374,7 +829,7 @@ async function pullAction(options) {
   spinner2.start("Generating code...");
   await generate({
     output: options.destination,
-    projectDef: definitionReference
+    config: definitionReference.parsed
   });
   spinner2.succeed(`Generated code to '${options.destination}'`);
 }
@@ -403,7 +858,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) {
@@ -518,7 +973,7 @@ async function pullAction2(options) {
   const config = await loadEnv(options.envPath);
   spinner4.succeed("Loaded environment variables.");
   spinner4.start("Loading project schema...");
-  const definition = await fetchDefinitionReference({
+  const definition = await fetchCurrentDefinition({
     baseUrl: config.ORIZM_BASE_URL,
     apiKey: config.ORIZM_API_KEY,
     projectName: config.ORIZM_PROJECT
@@ -526,7 +981,7 @@ async function pullAction2(options) {
   spinner4.succeed("Loaded project schema.");
   spinner4.start("Generating code...");
   await generate2({
-    definition,
+    definition: definition.parsed,
     output: options.destination
   });
   spinner4.succeed(`Generated code to '${options.destination}'`);
@@ -550,14 +1005,15 @@ import cliColor4 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 +1028,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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orizm/cli",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Orizm CLI",
   "type": "module",
   "repository": {
@@ -18,7 +18,6 @@
     "dotenv": "^16.3.1",
     "esbuild": "^0.17.19",
     "handlebars": "^4.7.7",
-    "openapi-fetch": "^0.12.2",
     "valibot": "^1.0.0",
     "@orizm/common": "1.13.1"
   },
@@ -27,14 +26,13 @@
   },
   "devDependencies": {
     "@types/cli-color": "^2.0.2",
-    "openapi-typescript": "^7.6.1",
-    "@orizm/package-configs": "0.0.0"
+    "@orizm/package-configs": "0.0.0",
+    "@orizm/private-api-clients": "0.0.0"
   },
   "license": "Apache-2.0",
   "scripts": {
     "dev": "tsup --watch",
     "build": "tsup",
-    "typecheck": "tsc --noEmit",
-    "generate": "openapi-typescript ../../apps/server/openapi/developerAPI.yaml --output src/api/developer-api.d.ts"
+    "typecheck": "tsc --noEmit"
   }
 }