fix(inherit): try resolve component from root directory

farnabaz · farnabaz · commit b0073f1d6064 · 2025-09-11T12:33:03.000+02:00
diff --git a/src/utils/collection.ts b/src/utils/collection.ts
@@ -251,11 +251,11 @@ export function generateCollectionTableDefinition(collection: ResolvedCollection
     // Handle default values
     if ('default' in property) {
       let defaultValue = typeof property.default === 'string'
-        ? `'${property.default}'`
+        ? wrapWithSingleQuote(property.default)
         : property.default
 
       if (!(defaultValue instanceof Date) && typeof defaultValue === 'object') {
-        defaultValue = `'${JSON.stringify(defaultValue)}'`
+        defaultValue = wrapWithSingleQuote(JSON.stringify(defaultValue))
       }
       constraints.push(`DEFAULT ${defaultValue}`)
     }
@@ -274,3 +274,13 @@ export function generateCollectionTableDefinition(collection: ResolvedCollection
 
   return definition
 }
+
+function wrapWithSingleQuote(value: string) {
+  if (value.startsWith('`') && value.endsWith('`')) {
+    value = value.slice(1, -1)
+  }
+  if (value.startsWith('\'') && value.endsWith('\'')) {
+    return value
+  }
+  return `'${value}'`
+}
diff --git a/src/utils/schema/index.ts b/src/utils/schema/index.ts
@@ -120,7 +120,7 @@ export function replaceComponentSchemas<T = Draft07Definition | Draft07Definitio
     const nuxt = useNuxt()
     let path = String($content?.inherit)
     try {
-      path = resolveModule(path)
+      path = resolveModule(path, { paths: [nuxt.options.rootDir] })
     }
     catch {
       // Ignore error

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ export function replaceComponentSchemas<T = Draft07Definition \| Draft07Definitio`
`120`	`120`	`const nuxt = useNuxt()`
`121`	`121`	`let path = String($content?.inherit)`
`122`	`122`	`try {`
`123`		`- path = resolveModule(path)`
	`123`	`+ path = resolveModule(path, { paths: [nuxt.options.rootDir] })`
`124`	`124`	`}`
`125`	`125`	`catch {`
`126`	`126`	`// Ignore error`