@base44-preview/cli 0.1.25-pr.649.a9d6bad → 0.1.25-pr.649.f26dd11

package/dist/cli/index.js

@@ -236712,13 +236712,19 @@ import { existsSync } from "node:fs";
 import { dirname as dirname10, join as join12 } from "node:path";
 
 // src/core/project/fallback.ts
-var DEFAULT_SITE = {
+var DEFAULT_SITE = Object.freeze({
   installCommand: "npm install",
   buildCommand: "npm run build",
   serveCommand: "npm run dev",
   outputDirectory: "./dist"
-};
+});
 var PLACEHOLDER_APP_NAME = "base44-app";
+var DEFAULTABLE_FIELDS = new Set([
+  "name",
+  "description",
+  "visibility",
+  "site"
+]);
 var warningHandler = () => {};
 var warned = new Set;
 function setConfigWarningHandler(handler) {
@@ -236737,6 +236743,9 @@ function defaultProjectConfig() {
     site: DEFAULT_SITE
   });
 }
+function onlyDefaultableFieldsInvalid(error) {
+  return error.issues.every((issue) => issue.path.length > 0 && DEFAULTABLE_FIELDS.has(String(issue.path[0])));
+}
 function salvageProjectConfig(raw, error) {
   if (typeof raw !== "object" || raw === null || Array.isArray(raw)) {
     return defaultProjectConfig();
@@ -238403,7 +238412,7 @@ var FieldRLSSchema = looseObject({
   delete: RLSRuleSchema.optional()
 });
 var PropertyDefinitionSchema = looseObject({
-  type: union([string2(), array(string2())]),
+  type: union([string2(), array(string2())]).optional(),
   title: string2().optional(),
   description: string2().optional(),
   minLength: number2().int().min(0).optional(),
@@ -238425,12 +238434,13 @@ var PropertyDefinitionSchema = looseObject({
     return record(string2(), PropertyDefinitionSchema).optional();
   }
 });
+var TopLevelPropertySchema = PropertyDefinitionSchema.refine((property) => property.type !== undefined, { message: "Top-level properties must declare a type", path: ["type"] });
 var EntitySchema = looseObject({
   type: literal("object").default("object"),
   name: string2().min(1).regex(/^\w+$/, "Entity name must contain only letters, numbers, and underscores"),
   title: string2().optional(),
   description: string2().optional(),
-  properties: record(string2(), PropertyDefinitionSchema).default({}),
+  properties: record(string2(), TopLevelPropertySchema).default({}),
   required: array(string2()).optional(),
   rls: EntityRLSSchema.optional(),
   source: ResourceSourceSchema.default({ type: "project" })
@@ -239127,20 +239137,23 @@ async function openLogStream(filters) {
   return { kind: "stream", events: readStreamEvents(response.body) };
 }
 // src/core/project/config.ts
+var PROJECT_ROOT_NOT_FOUND = `Project root not found. Please ensure config.jsonc or config.json exists in the project directory or ${PROJECT_SUBDIR}/ subdirectory.`;
+
 class ProjectConfigReader {
   pluginSourceByNamespace = new Map;
   async readProjectSettings(projectRoot) {
+    const { root, configPath } = await this.findConfigOrThrow(projectRoot);
+    const project = await this.readConfigFile(configPath, "safe");
+    this.assertPluginProjectDoesNotLoadPlugins(project, configPath);
+    return { ...project, root, configPath };
+  }
+  async readProjectSettingsOrDefaults(projectRoot) {
     const found = this.findConfig(projectRoot);
     if (!found) {
       return this.defaultSettingsOrThrow(projectRoot);
     }
-    const { root, configPath } = found;
-    const project = await this.readConfigFileOrDefaults(configPath);
-    return {
-      ...this.withoutPluginsInPluginProject(project, configPath),
-      root,
-      configPath
-    };
+    const project = await this.readConfigFile(found.configPath, "lenient");
+    return { ...project, ...found };
   }
   async readProjectConfig(projectRoot) {
     const project = await this.readProjectSettings(projectRoot);
@@ -239170,6 +239183,13 @@ class ProjectConfigReader {
       authConfig: localResources.authConfig
     };
   }
+  async findConfigOrThrow(projectRoot) {
+    const found = this.findConfig(projectRoot);
+    if (!found) {
+      throw new ConfigNotFoundError(PROJECT_ROOT_NOT_FOUND);
+    }
+    return found;
+  }
   findConfig(projectRoot) {
     if (!projectRoot) {
       return findProjectRoot();
@@ -239180,17 +239200,20 @@ class ProjectConfigReader {
   defaultSettingsOrThrow(projectRoot) {
     const root = projectRoot ?? process.cwd();
     if (!existsSync(join12(root, "package.json"))) {
-      throw new ConfigNotFoundError(`Project root not found. Please ensure config.jsonc or config.json exists in the project directory or ${PROJECT_SUBDIR}/ subdirectory.`);
+      throw new ConfigNotFoundError(PROJECT_ROOT_NOT_FOUND);
     }
-    const configPath = join12(root, PROJECT_SUBDIR, "config.jsonc");
     warnConfigFallback(`No ${PROJECT_SUBDIR}/config.jsonc found in ${root}; using the default project config.`);
+    const configPath = join12(root, PROJECT_SUBDIR, "config.jsonc");
     return { ...defaultProjectConfig(), root, configPath };
   }
-  async readConfigFileOrDefaults(configPath) {
+  async readConfigFile(configPath, mode = "strict") {
     let parsed;
     try {
       parsed = await readJsonFile(configPath);
     } catch (error) {
+      if (mode !== "lenient") {
+        throw error;
+      }
       warnConfigFallback(`${configPath} could not be read (${errorMessage(error)}); using the default project config.`);
       return defaultProjectConfig();
     }
@@ -239198,6 +239221,10 @@ class ProjectConfigReader {
     if (result.success) {
       return result.data;
     }
+    const defaultable = mode === "lenient" || mode === "safe" && onlyDefaultableFieldsInvalid(result.error);
+    if (!defaultable) {
+      throw new SchemaValidationError("Invalid project configuration", result.error, configPath);
+    }
     warnConfigFallback(`Invalid project configuration in ${configPath}; using defaults for the invalid fields:
 ${prettifyError(result.error)}`);
     return salvageProjectConfig(parsed, result.error);
@@ -239231,19 +239258,10 @@ ${prettifyError(result.error)}`);
       authConfig
     };
   }
-  async readPluginConfigFile(configPath) {
-    const result = ProjectConfigSchema.safeParse(await readJsonFile(configPath));
-    if (!result.success) {
-      throw new SchemaValidationError("Invalid project configuration", result.error, configPath);
-    }
-    return result.data;
-  }
-  withoutPluginsInPluginProject(project, configPath) {
-    if (!project.plugin || project.plugins.length === 0) {
-      return project;
+  assertPluginProjectDoesNotLoadPlugins(project, configPath) {
+    if (project.plugin && project.plugins.length > 0) {
+      throw new ConfigInvalidError("Plugin projects cannot define plugins in this version.", configPath);
     }
-    warnConfigFallback(`${configPath}: plugin projects cannot define plugins in this version; ignoring 'plugins'.`);
-    return { ...project, plugins: [] };
   }
   registerPluginNamespace(namespace, source, configPath) {
     const existingSource = this.pluginSourceByNamespace.get(namespace);
@@ -239260,15 +239278,10 @@ ${prettifyError(result.error)}`);
   }
   async readPluginConfig(plugin, hostConfigPath) {
     const pluginRoot = resolvePluginRoot(plugin.source, dirname10(hostConfigPath));
-    const configPath = findConfigInDir(pluginRoot);
-    if (!configPath) {
-      throw new ConfigNotFoundError(`Project root not found. Please ensure config.jsonc or config.json exists in the project directory or ${PROJECT_SUBDIR}/ subdirectory.`);
-    }
-    const project = await this.readPluginConfigFile(configPath);
+    const { configPath } = await this.findConfigOrThrow(pluginRoot);
+    const project = await this.readConfigFile(configPath);
     const namespace = requirePluginNamespace(project, plugin.source, configPath);
-    if (project.plugins.length > 0) {
-      throw new ConfigInvalidError("Plugin projects cannot define plugins in this version.", configPath);
-    }
+    this.assertPluginProjectDoesNotLoadPlugins(project, configPath);
     return { configPath, namespace, project, source: plugin.source };
   }
   async readPluginResources(project, configPath, namespace) {
@@ -239347,6 +239360,10 @@ async function readProjectSettings(projectRoot) {
   const reader = new ProjectConfigReader;
   return await reader.readProjectSettings(projectRoot);
 }
+async function readProjectSettingsOrDefaults(projectRoot) {
+  const reader = new ProjectConfigReader;
+  return await reader.readProjectSettingsOrDefaults(projectRoot);
+}
 function errorMessage(error) {
   return error instanceof Error ? error.message : String(error);
 }
@@ -251730,7 +251747,7 @@ async function siteDevAction(ctx, forwarded) {
   if (!app?.projectRoot) {
     throw new ConfigInvalidError("base44 site dev requires a linked local project. Run it from a project with base44/.app.jsonc.");
   }
-  const project = await readProjectSettings(app.projectRoot);
+  const project = await readProjectSettingsOrDefaults(app.projectRoot);
   const site = siteOrDefault(project);
   const serveCommand = site.serveCommand ?? DEFAULT_SERVE_COMMAND;
   const command = [serveCommand, ...forwarded].join(" ");
@@ -251752,7 +251769,7 @@ function getSiteDevCommand() {
 async function installAction({
   runTask
 }) {
-  const project = await readProjectSettings();
+  const project = await readProjectSettingsOrDefaults();
   const { installCommand } = siteOrDefault(project);
   await runTask("Installing site dependencies...", () => execa({ cwd: project.root, shell: true })`${installCommand}`, {
     successMessage: "Dependencies installed",
@@ -253232,7 +253249,7 @@ class Validator {
         error: this.createValidationError(`Error in field ${fieldPath}: Input should be a valid ${types.join(" or ")}`)
       };
     }
-    const propertyType = property.type;
+    const propertyType = property.type ?? "string";
     if (!fieldTypes.includes(propertyType)) {
       return {
         hasError: true,
@@ -260629,4 +260646,4 @@ export {
   runCLI
 };
 
-//# debugId=545CDC42F775B10764756E2164756E21
+//# debugId=75B8BBCB3D7C918E64756E2164756E21