Skip to content

fix: prevent warnings about missing component when type is used inste… #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 5, 2024
Merged

fix: prevent warnings about missing component when type is used inste… #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 28 additions & 13 deletions packages/core/src/compiler/definitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
LocalSchemaProp,
LocalTextReference,
LocalValue,
NoCodeComponentDefinition,
NoCodeComponentEntry,
NumberSchemaProp,
Option,
Expand All @@ -49,7 +50,6 @@ import {
findComponentDefinitionById,
findComponentDefinitionsByType,
} from "./findComponentDefinition";
import { isContextEditorContext } from "./isContextEditorContext";
import { Component$$$SchemaProp } from "./schema";
import {
CompilationContextType,
Expand Down Expand Up @@ -363,36 +363,51 @@ export const schemaPropDefinitions: SchemaPropDefinitionProviders = {
// 2. if fixed => block field with "fixed" flag (no component picker).
const normalize = (x: any) => {
if (!Array.isArray(x) || x.length === 0) {
if (schemaProp.required) {
const accepts = schemaProp.accepts[0];
const componentDefinition = findComponentDefinitionById(
accepts,
let componentDefinition: NoCodeComponentDefinition | undefined;

for (const componentIdOrType of schemaProp.accepts) {
componentDefinition = findComponentDefinitionById(
componentIdOrType,
compilationContext
);

if (!componentDefinition) {
const componentDefinitionsByType = findComponentDefinitionsByType(
accepts,
componentIdOrType,
compilationContext
);

if (componentDefinitionsByType.length > 0) {
return [
normalizeComponent(
{ _component: componentDefinitionsByType[0].id },
compilationContext
),
];
componentDefinition = componentDefinitionsByType[0];
break;
}
} else {
break;
}
}

if (schemaProp.required) {
if (!componentDefinition) {
throw new Error(
`Missing component definition for prop "${
schemaProp.prop
}" for specified accepted types: [${schemaProp.accepts.join(
", "
)}]`
);
}

return [
normalizeComponent({ _component: accepts }, compilationContext),
normalizeComponent(
{ _component: componentDefinition.id },
compilationContext
),
];
}

return [];
}

return [normalizeComponent(x[0], compilationContext)];
};

Expand Down
3 changes: 0 additions & 3 deletions packages/editor/src/utils/config/configMap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ function configMapInternal(
const result: NoCodeComponentEntry = { ...config };

if (!componentDefinition) {
console.warn(
`[configMap] Unknown component definition for: ${config._component}`
);
return result;
}

Expand Down