@orizm/cli 2.1.2 → 2.2.1

package/dist/cli.js

@@ -139,7 +139,7 @@ function getPath(issue) {
     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) {
+        if (pathItem.value != null && typeof pathItem.value === "object" && "name" in pathItem.value) {
           pathParts[i] = String(pathItem.value.name);
           pathInfoIndex = j + 1;
           break;
@@ -189,7 +189,7 @@ var client_ts_default = '//  This file was automatically generated and should no
 import * as prettier from "prettier/standalone";
 import prettierPluginEstree from "prettier/plugins/estree.js";
 import prettierPluginTypeScript from "prettier/plugins/typescript.js";
-async function formatTsWithPrettier(code) {
+function formatTsWithPrettier(code) {
   return prettier.format(code, {
     parser: "typescript",
     plugins: [prettierPluginEstree, prettierPluginTypeScript]
@@ -216,7 +216,7 @@ Handlebars.registerHelper(
       return toCodeTypeName(column.moduleName) + moduleSuffix;
     } else if (column.type === "module-array") {
       return toCodeTypeName(column.moduleName) + moduleSuffix + "[]";
-    } else if (column.type == "json") {
+    } else if (column.type === "json") {
       return "unknown";
     } else if (column.type === "storage") {
       return "StorageItemType";
@@ -228,7 +228,7 @@ Handlebars.registerHelper(
 Handlebars.registerHelper(
   "filterRefColumn",
   (columns) => {
-    return (columns || []).filter(
+    return (columns ?? []).filter(
       (c) => c.type === "reference" && c.tableName && c.includeName || c.type === "module" && c.moduleName || c.type === "module-array" && c.moduleName
     );
   }
@@ -255,7 +255,7 @@ Handlebars.registerHelper(
 Handlebars.registerHelper(
   "filterUniqueIndexes",
   (indexes) => {
-    return (indexes || []).filter((i) => i.unique);
+    return (indexes ?? []).filter((i) => i.unique);
   }
 );
 Handlebars.registerHelper(
@@ -956,7 +956,7 @@ Handlebars2.registerHelper("toCodeTypeName", toCodeTypeName2);
 Handlebars2.registerHelper("typeName", (column) => {
   if (column.type === "reference") {
     return "string";
-  } else if (column.type == "json") {
+  } else if (column.type === "json") {
     return "unknown";
   } else if (column.type === "module") {
     if (!column.moduleName) {
@@ -977,7 +977,7 @@ Handlebars2.registerHelper("typeName", (column) => {
 Handlebars2.registerHelper(
   "filterRefColumn",
   (columns) => {
-    return (columns || []).filter(
+    return (columns ?? []).filter(
       (c) => c.type === "reference" && c.tableName && c.includeName || c.type === "module" && c.moduleName || c.type === "module-array" && c.moduleName
     );
   }
@@ -996,7 +996,7 @@ Handlebars2.registerHelper("includeType", (column) => {
 Handlebars2.registerHelper(
   "filterUniqueIndexes",
   (indexes) => {
-    return (indexes || []).filter((i) => i.unique);
+    return (indexes ?? []).filter((i) => i.unique);
   }
 );
 Handlebars2.registerHelper(
@@ -1082,9 +1082,10 @@ var consumerPullCommand = new Command4("pull").description("pull orizm schema an
 
 // src/push/command.ts
 import { Command as Command5 } from "commander";
-import cliColor5 from "cli-color";
+import cliColor6 from "cli-color";
 
 // src/lib/developer-api.ts
+import cliColor4 from "cli-color";
 async function applyDefinition(env, projectDef) {
   const client = createDeveloperAPIv2Client({
     serverOrigin: env.ORIZM_BASE_URL,
@@ -1103,6 +1104,10 @@ async function applyDefinition(env, projectDef) {
         "401 Unauthorized. Please check your Developer API key and try again."
       );
     }
+    if (response.error.type === "bad-request") {
+      console.log(cliColor4.red(response.error.detail));
+      process.exit(1);
+    }
     throw new Error(
       `${status} ${response.response.statusText}: Unexpected error occurred while applying schema.`
     );
@@ -1138,7 +1143,7 @@ var getChangeEvents = async (env, projectDef) => {
 };
 
 // src/lib/display-change-events.ts
-import cliColor4 from "cli-color";
+import cliColor5 from "cli-color";
 
 // src/lib/cli-table.ts
 var COLORS = {
@@ -1175,7 +1180,7 @@ var CliTable = class {
   updateColumnWidths(row) {
     for (let i = 0; i < row.length; i++) {
       const cellLength = row[i].length;
-      if (!this.columnWidths[i] || cellLength > this.columnWidths[i]) {
+      if (this.columnWidths[i] == null || cellLength > this.columnWidths[i]) {
         this.columnWidths[i] = cellLength;
       }
     }
@@ -1239,7 +1244,7 @@ var CliTable = class {
 };
 
 // src/lib/display-change-events.ts
-async function displayChangeEvents(changeEvents) {
+function displayChangeEvents(changeEvents) {
   const {
     tableChangeEvents = [],
     bucketChangeEvents = [],
@@ -1247,7 +1252,7 @@ async function displayChangeEvents(changeEvents) {
   } = changeEvents;
   if (tableChangeEvents.length === 0 && bucketChangeEvents.length === 0 && authorityChangeEvents.length === 0) {
     console.log();
-    console.log(cliColor4.green("No changes."));
+    console.log(cliColor5.green("No changes."));
     return;
   }
   displayTableChangeEvents(tableChangeEvents);
@@ -1392,6 +1397,18 @@ function displayTableChangeEvents(tableChangeEvents) {
           });
           break;
         }
+        case "draft:enable": {
+          table.addRow(["table", event.tableDef.name, eventName, ""], {
+            color: "green"
+          });
+          break;
+        }
+        case "draft:disable": {
+          table.addRow(["table", event.tableDef.name, eventName, ""], {
+            color: "red"
+          });
+          break;
+        }
         case "formSubmissions:create":
         case "formSubmissions:update": {
           table.addRow(["table", event.tableDef.name, eventName, ""], {
@@ -1499,38 +1516,40 @@ async function input(prompt) {
 
 // src/push/command.ts
 var spinner5 = createSpinner();
-var pushCommand = new Command5("push").description("apply schema to project.").option("-e, --env <path>", "env file path.").option("-c, --config <path>", "orizm config file path.", "orizm.config.ts").option("--dry-run", "display change-events without applying schema.", false).option("-y, --yes", "apply schema without confirmation.", false).action(async (options) => {
-  try {
-    spinner5.start("Loading environment variables...");
-    const env = await loadEnv(options.env);
-    spinner5.succeed("Loaded environment variables.");
-    spinner5.start("Loading project config...");
-    const projectDef = await loadConfig(options.config);
-    spinner5.succeed("Loaded project config.");
-    spinner5.start("Fetch schema change events...");
-    const changeEvents = await getChangeEvents(env, projectDef);
-    spinner5.succeed("Fetch schema change events.");
-    await displayChangeEvents(changeEvents);
-    if (changeEvents.tableChangeEvents.length === 0 && changeEvents.bucketChangeEvents.length === 0 && changeEvents.authorityChangeEvents.length === 0) {
-      return;
-    }
-    if (options.dryRun) {
-      return;
-    }
-    if (!options.yes) {
-      const confirm = await input("Do you want to apply schema? (y/N): ");
-      if (confirm !== "y") {
-        console.log(cliColor5.red("Canceled."));
+var pushCommand = new Command5("push").description("apply schema to project.").option("-e, --env <path>", "env file path.").option("-c, --config <path>", "orizm config file path.", "orizm.config.ts").option("--dry-run", "display change-events without applying schema.", false).option("-y, --yes", "apply schema without confirmation.", false).action(
+  async (options) => {
+    try {
+      spinner5.start("Loading environment variables...");
+      const env = await loadEnv(options.env);
+      spinner5.succeed("Loaded environment variables.");
+      spinner5.start("Loading project config...");
+      const projectDef = await loadConfig(options.config);
+      spinner5.succeed("Loaded project config.");
+      spinner5.start("Fetch schema change events...");
+      const changeEvents = await getChangeEvents(env, projectDef);
+      spinner5.succeed("Fetch schema change events.");
+      await displayChangeEvents(changeEvents);
+      if (changeEvents.tableChangeEvents.length === 0 && changeEvents.bucketChangeEvents.length === 0 && changeEvents.authorityChangeEvents.length === 0) {
         return;
       }
+      if (options.dryRun) {
+        return;
+      }
+      if (!options.yes) {
+        const confirm = await input("Do you want to apply schema? (y/N): ");
+        if (confirm !== "y") {
+          console.log(cliColor6.red("Canceled."));
+          return;
+        }
+      }
+      spinner5.start("Applying schema...");
+      await applyDefinition(env, projectDef);
+      spinner5.succeed("Schema applied.");
+    } catch (error2) {
+      handleError(error2);
     }
-    spinner5.start("Applying schema...");
-    await applyDefinition(env, projectDef);
-    spinner5.succeed("Schema applied.");
-  } catch (error2) {
-    handleError(error2);
   }
-});
+);
 
 // src/config/validate/command.ts
 import { Command as Command6 } from "commander";
@@ -1546,7 +1565,7 @@ function watchConfigFile(configPath, onFileChange) {
   });
   let isProcessing = false;
   let timeoutId = null;
-  const debouncedOnChange = async () => {
+  const debouncedOnChange = () => {
     if (isProcessing) return;
     if (timeoutId) {
       clearTimeout(timeoutId);
@@ -1627,12 +1646,6 @@ function generate3(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) {
@@ -1665,11 +1678,11 @@ function convertToInput(config) {
         const moduleTableName = `${table.name}_${column.name}_${column.moduleName}`;
         modules.push({
           name: moduleTableName,
-          columns: module?.columns.map((c) => ({
+          columns: module.columns.map((c) => ({
             name: c.name,
             type: c.type,
             isForeignKey: c.type === "reference"
-          })) || []
+          }))
         });
         relations.push({
           from: table.name,