fix(schema): add changes from main

kickstartDS · Oct 4, 2024 · 32284ae · 32284ae
2 parents 15a8a48 + 40d4f36
commit 32284ae
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/tasks/schema/types-task.ts b/src/tasks/schema/types-task.ts
@@ -62,7 +62,8 @@ const run = async (
     const types = await schemaGenerateComponentPropTypes(
       globs,
       mergeSchemas,
-      defaultPageSchema
+      defaultPageSchema,
+      componentsPath
     );
 
     await Promise.all(

diff --git a/src/util/schema.ts b/src/util/schema.ts
@@ -9,7 +9,6 @@ import {
   getUniqueSchemaIds,
   isLayering,
   layeredSchemaId,
-  processSchemaGlob,
   shouldLayer,
   dereference,
   IClassifierResult,
@@ -82,7 +81,8 @@ export default (logger: winston.Logger): SchemaUtil => {
   const generateComponentPropTypes = async (
     schemaGlobs: string[],
     mergeAllOf: boolean,
-    defaultPageSchema = true
+    defaultPageSchema = true,
+    componentsPath = 'src/components'
   ) => {
     subCmdLogger.info(
       chalkTemplate`generating component prop types for component schemas`
@@ -103,6 +103,13 @@ export default (logger: winston.Logger): SchemaUtil => {
           )}Props } from '@kickstartds/${getSchemaModule(
             schemaId
           )}/lib/${getSchemaName(schemaId)}/typing'`
+        : componentsPath.startsWith('node_modules/')
+        ? `import type { ${pascalCase(
+            getSchemaName(schemaId)
+          )}Props } from '${componentsPath
+            .split('/')
+            .slice(1, 2)
+            .join('/')}/${getSchemaName(schemaId)}`
         : `import type { ${pascalCase(
             getSchemaName(schemaId)
           )}Props } from '../${getSchemaName(schemaId)}/${pascalCase(

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -216,7 +216,8 @@ interface SchemaUtil {
     generateComponentPropTypes: (
       schemaGlobs: string[],
       mergeAllOf: boolean,
-      defaultPageSchema: boolean
+      defaultPageSchema: boolean,
+      componentsPath: string
     ) => Promise<Record<string, string>>;
     layerComponentPropTypes: (
       schemaGlobs: string[],