@base44-preview/cli 0.0.44-pr.412.0c3809e → 0.0.44-pr.412.e4034f6

package/dist/cli/index.js

@@ -238100,7 +238100,7 @@ var FieldRLSSchema = exports_external.looseObject({
   delete: RLSRuleSchema.optional()
 });
 var PropertyDefinitionSchema = exports_external.looseObject({
-  type: exports_external.string().optional(),
+  type: exports_external.string(),
   title: exports_external.string().optional(),
   description: exports_external.string().optional(),
   minLength: exports_external.number().int().min(0).optional(),
@@ -238473,22 +238473,27 @@ async function deployFunctionsSequentially(functions, options) {
   }
   return results;
 }
-async function pruneRemovedFunctions(localFunctionNames) {
+async function pruneRemovedFunctions(localFunctionNames, options) {
   const remote = await listDeployedFunctions();
   const localSet = new Set(localFunctionNames);
   const toDelete = remote.functions.filter((f) => !localSet.has(f.name));
+  options?.onStart?.(toDelete.length);
   const results = [];
   for (const fn of toDelete) {
+    options?.onBeforeDelete?.(fn.name);
+    let result;
     try {
       await deleteSingleFunction(fn.name);
-      results.push({ name: fn.name, deleted: true });
+      result = { name: fn.name, deleted: true };
     } catch (error48) {
-      results.push({
+      result = {
         name: fn.name,
         deleted: false,
         error: error48 instanceof Error ? error48.message : String(error48)
-      });
+      };
     }
+    results.push(result);
+    options?.onResult?.(result);
   }
   return results;
 }
@@ -247822,17 +247827,17 @@ function resolveFunctionsToDeploy(names, allFunctions) {
   }
   return allFunctions.filter((f) => names.includes(f.name));
 }
-function formatPruneResults(pruneResults) {
-  for (const pruneResult of pruneResults) {
-    if (pruneResult.deleted) {
-      R2.success(`${pruneResult.name.padEnd(25)} deleted`);
-    } else {
-      R2.error(`${pruneResult.name.padEnd(25)} error: ${pruneResult.error}`);
-    }
+function formatPruneResult(pruneResult) {
+  if (pruneResult.deleted) {
+    R2.success(`${pruneResult.name.padEnd(25)} deleted`);
+  } else {
+    R2.error(`${pruneResult.name.padEnd(25)} error: ${pruneResult.error}`);
   }
+}
+function formatPruneSummary(pruneResults) {
   if (pruneResults.length > 0) {
     const pruned = pruneResults.filter((r) => r.deleted).length;
-    R2.info(`${pruned} function${pruned !== 1 ? "s" : ""} removed`);
+    R2.info(`${pruned} deleted`);
   }
 }
 function buildDeploySummary(results) {
@@ -247873,10 +247878,23 @@ async function deployFunctionsAction(names, options) {
     }
   });
   if (options.force) {
-    R2.info("Removing remote functions not found locally...");
     const allLocalNames = functions.map((f) => f.name);
-    const pruneResults = await pruneRemovedFunctions(allLocalNames);
-    formatPruneResults(pruneResults);
+    let pruneCompleted = 0;
+    let pruneTotal = 0;
+    const pruneResults = await pruneRemovedFunctions(allLocalNames, {
+      onStart: (total2) => {
+        pruneTotal = total2;
+        if (total2 > 0) {
+          R2.info(`Found ${total2} remote ${total2 === 1 ? "function" : "functions"} to delete`);
+        }
+      },
+      onBeforeDelete: (name2) => {
+        pruneCompleted++;
+        R2.step(theme.styles.dim(`[${pruneCompleted}/${pruneTotal}] Deleting ${name2}...`));
+      },
+      onResult: formatPruneResult
+    });
+    formatPruneSummary(pruneResults);
   }
   return { outroMessage: buildDeploySummary(results) };
 }
@@ -247949,7 +247967,7 @@ async function pullFunctionsAction(name2) {
   };
 }
 function getPullCommand(context) {
-  return new Command("pull").description("Pull deployed functions from Base44").argument("[name]", "Pull a single function by name").action(async (name2) => {
+  return new Command("pull").description("Pull deployed functions from Base44").argument("[name]", "Function name to pull (pulls all if omitted)").action(async (name2) => {
     await runCommand(() => pullFunctionsAction(name2), { requireAuth: true }, context);
   });
 }
@@ -249156,14 +249174,163 @@ function createFunctionRouter(manager, logger) {
   return router;
 }
 
-// src/cli/dev/dev-server/database.ts
+// src/cli/dev/dev-server/db/database.ts
 var import_nedb = __toESM(require_nedb(), 1);
 
+// src/cli/dev/dev-server/db/validator.ts
+var fieldTypes = [
+  "string",
+  "integer",
+  "number",
+  "boolean",
+  "array",
+  "object"
+];
+
+class Validator {
+  filterFields(record2, entitySchema) {
+    const filteredRecord = {};
+    for (const [key2, value] of Object.entries(record2)) {
+      if (entitySchema.properties[key2]) {
+        filteredRecord[key2] = value;
+      }
+    }
+    return filteredRecord;
+  }
+  applyDefaults(record2, entitySchema) {
+    const result = {};
+    for (const [key2, property] of Object.entries(entitySchema.properties)) {
+      if (property.default !== undefined) {
+        result[key2] = property.default;
+      }
+    }
+    return {
+      ...result,
+      ...record2
+    };
+  }
+  validate(record2, entitySchema, partial2 = false) {
+    if (!partial2) {
+      const requiredFieldsResponse = this.validateRequiredFields(record2, entitySchema);
+      if (requiredFieldsResponse.hasError) {
+        return requiredFieldsResponse;
+      }
+    }
+    const fieldTypesResponse = this.validateFieldTypes(record2, entitySchema);
+    if (fieldTypesResponse.hasError) {
+      return fieldTypesResponse;
+    }
+    return {
+      hasError: false
+    };
+  }
+  createValidationError(message) {
+    return {
+      error_type: "ValidationError",
+      message,
+      request_id: null,
+      traceback: ""
+    };
+  }
+  validateFieldTypes(record2, entitySchema) {
+    for (const [key2, value] of Object.entries(record2)) {
+      const property = entitySchema.properties[key2];
+      const result = this.validateValue(value, property, key2);
+      if (result.hasError)
+        return result;
+    }
+    return {
+      hasError: false
+    };
+  }
+  validateValue(value, property, fieldPath) {
+    if (!property) {
+      return { hasError: false };
+    }
+    const propertyType = property.type;
+    if (!fieldTypes.includes(propertyType)) {
+      return {
+        hasError: true,
+        error: this.createValidationError(`Error in field ${fieldPath}: Unsupported field type ${propertyType}`)
+      };
+    }
+    switch (propertyType) {
+      case "array":
+        if (!Array.isArray(value)) {
+          return {
+            hasError: true,
+            error: this.createValidationError(`Error in field ${fieldPath}: Input should be a valid array`)
+          };
+        }
+        if (property.items) {
+          for (let i5 = 0;i5 < value.length; i5++) {
+            const itemResult = this.validateValue(value[i5], property.items, `${fieldPath}[${i5}]`);
+            if (itemResult.hasError)
+              return itemResult;
+          }
+        }
+        break;
+      case "object":
+        if (typeof value !== "object" || value === null || Array.isArray(value)) {
+          return {
+            hasError: true,
+            error: this.createValidationError(`Error in field ${fieldPath}: Input should be a valid object`)
+          };
+        }
+        if (property.properties) {
+          for (const [subKey, subValue] of Object.entries(value)) {
+            if (property.properties[subKey]) {
+              const subResult = this.validateValue(subValue, property.properties[subKey], `${fieldPath}.${subKey}`);
+              if (subResult.hasError)
+                return subResult;
+            }
+          }
+        }
+        break;
+      case "integer":
+        if (!Number.isInteger(value)) {
+          return {
+            hasError: true,
+            error: this.createValidationError(`Error in field ${fieldPath}: Input should be a valid integer`)
+          };
+        }
+        break;
+      default:
+        if (typeof value !== propertyType) {
+          return {
+            hasError: true,
+            error: this.createValidationError(`Error in field ${fieldPath}: Input should be a valid ${propertyType}`)
+          };
+        }
+    }
+    return { hasError: false };
+  }
+  validateRequiredFields(record2, entitySchema) {
+    if (entitySchema.required && entitySchema.required.length > 0) {
+      for (const required2 of entitySchema.required) {
+        if (record2[required2] == null) {
+          return {
+            hasError: true,
+            error: this.createValidationError(`Error in field ${required2}: Field required`)
+          };
+        }
+      }
+    }
+    return {
+      hasError: false
+    };
+  }
+}
+
+// src/cli/dev/dev-server/db/database.ts
 class Database {
   collections = new Map;
+  schemas = new Map;
+  validator = new Validator;
   load(entities) {
     for (const entity2 of entities) {
       this.collections.set(entity2.name, new import_nedb.default);
+      this.schemas.set(entity2.name, entity2);
     }
   }
   getCollection(name2) {
@@ -249177,6 +249344,25 @@ class Database {
       collection.remove({}, { multi: true });
     }
     this.collections.clear();
+    this.schemas.clear();
+  }
+  validate(entityName, record2, partial2 = false) {
+    const schema9 = this.schemas.get(entityName);
+    if (!schema9) {
+      throw new Error(`Entity "${entityName}" not found`);
+    }
+    return this.validator.validate(record2, schema9, partial2);
+  }
+  prepareRecord(entityName, record2, partial2 = false) {
+    const schema9 = this.schemas.get(entityName);
+    if (!schema9) {
+      throw new Error(`Entity "${entityName}" not found`);
+    }
+    const filteredRecord = this.validator.filterFields(record2, schema9);
+    if (partial2) {
+      return filteredRecord;
+    }
+    return this.validator.applyDefaults(filteredRecord, schema9);
   }
 }
 
@@ -249368,8 +249554,14 @@ function createEntityRoutes(db2, logger, remoteProxy, broadcast) {
     try {
       const now = new Date().toISOString();
       const { _id, ...body } = req.body;
+      const filteredBody = db2.prepareRecord(entityName, body);
+      const validation = db2.validate(entityName, filteredBody);
+      if (validation.hasError) {
+        res.status(422).json(validation.error);
+        return;
+      }
       const record2 = {
-        ...body,
+        ...filteredBody,
         id: nanoid3(),
         created_date: now,
         updated_date: now
@@ -249390,12 +249582,21 @@ function createEntityRoutes(db2, logger, remoteProxy, broadcast) {
     }
     try {
       const now = new Date().toISOString();
-      const records = req.body.map((item) => ({
-        ...item,
-        id: nanoid3(),
-        created_date: now,
-        updated_date: now
-      }));
+      const records = [];
+      for (const record2 of req.body) {
+        const filteredRecord = db2.prepareRecord(entityName, record2);
+        const validation = db2.validate(entityName, filteredRecord);
+        if (validation.hasError) {
+          res.status(422).json(validation.error);
+          return;
+        }
+        records.push({
+          ...filteredRecord,
+          id: nanoid3(),
+          created_date: now,
+          updated_date: now
+        });
+      }
       const inserted = stripInternalFields(await collection.insertAsync(records));
       emit(appId, entityName, "create", inserted);
       res.status(201).json(inserted);
@@ -249408,8 +249609,14 @@ function createEntityRoutes(db2, logger, remoteProxy, broadcast) {
     const { appId, entityName, id: id2 } = req.params;
     const { id: _id, created_date: _created_date, ...body } = req.body;
     try {
+      const filteredBody = db2.prepareRecord(entityName, body, true);
+      const validation = db2.validate(entityName, filteredBody, true);
+      if (validation.hasError) {
+        res.status(422).json(validation.error);
+        return;
+      }
       const updateData = {
-        ...body,
+        ...filteredBody,
         updated_date: new Date().toISOString()
       };
       const result = await collection.updateAsync({ id: id2 }, { $set: updateData }, { returnUpdatedDocs: true });
@@ -255753,4 +255960,4 @@ export {
   CLIExitError
 };
 
-//# debugId=8533D2C01A675ED464756E2164756E21
+//# debugId=CD060DA1B6F7116364756E2164756E21