@zenstackhq/language 3.0.0-beta.30 → 3.0.0-beta.32

package/dist/index.js

@@ -6615,13 +6615,22 @@ var DataSourceValidator = class {
         accept("error", '"schemas" must be an array of string literals', {
           node: schemasField
         });
-      } else if (
-        // validate `defaultSchema` is included in `schemas`
-        defaultSchemaValue && !schemasValue.items.some((e) => getStringLiteral(e) === defaultSchemaValue)
-      ) {
-        accept("error", `"${defaultSchemaValue}" must be included in the "schemas" array`, {
-          node: schemasField
-        });
+      } else {
+        const schemasArray = schemasValue.items.map((e) => getStringLiteral(e));
+        if (defaultSchemaValue) {
+          if (!schemasArray.includes(defaultSchemaValue)) {
+            accept("error", `"${defaultSchemaValue}" must be included in the "schemas" array`, {
+              node: schemasField
+            });
+          }
+        } else {
+          const hasImplicitPublicSchema = ds.$container.declarations.some((d) => (isDataModel(d) || isEnum(d)) && !d.attributes.some((a) => a.decl.$refText === "@@schema"));
+          if (hasImplicitPublicSchema && !schemasArray.includes("public")) {
+            accept("error", `"public" must be included in the "schemas" array`, {
+              node: schemasField
+            });
+          }
+        }
       }
     }
   }