fix(schema): option for page schema exclusion

kickstartDS · Sep 24, 2024 · 38509dd · 38509dd
1 parent d9aff4f
commit 38509dd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/commands/schema/dereference.ts b/src/commands/schema/dereference.ts
@@ -16,8 +16,8 @@ const dereference = new Command('dereference')
     chalkTemplate`relative path from project root to your cms specific components directory, default {bold ./src/components}`
   )
   .option(
-    '--load-page-schema',
-    chalkTemplate`load default page schema, default {bold true}`
+    '--no-default-page-schema',
+    chalkTemplate`disable load of default page schema, default {bold false}`
   )
   .option(
     '--rc-only',
@@ -35,7 +35,7 @@ const dereference = new Command('dereference')
     runTask(
       options.componentsPath,
       options.cmsPath,
-      options.loadPageSchema,
+      options.defaultPageSchema,
       options.rcOnly,
       options.revert,
       options.cleanup,

diff --git a/src/tasks/schema/dereference-task.ts b/src/tasks/schema/dereference-task.ts
@@ -31,7 +31,7 @@ const {
 const run = async (
   componentsPath: string = 'src/components',
   cmsPath: string,
-  loadPageSchema: boolean = true,
+  defaultPageSchema: boolean = true,
   rcOnly: boolean,
   isRevert: boolean,
   shouldCleanup: boolean,
@@ -57,7 +57,7 @@ const run = async (
       globs.push(`${callingPath}/${cmsPath}/**/*.schema.json`);
     }
     const customSchemaPaths = await fg(globs);
-    const dereffed = await schemaDereferenceSchemas(globs, loadPageSchema);
+    const dereffed = await schemaDereferenceSchemas(globs, defaultPageSchema);
 
     logger.info(
       chalkTemplate`dereffed {bold ${

diff --git a/src/util/schema.ts b/src/util/schema.ts
@@ -28,11 +28,11 @@ export default (logger: winston.Logger): SchemaUtil => {
 
   const dereferenceSchemas = async (
     schemaGlobs: string[],
-    loadPageSchema = true
+    defaultPageSchema = true
   ) => {
     const ajv = getSchemaRegistry();
     const schemaIds = await processSchemaGlobs(schemaGlobs, ajv, {
-      loadPageSchema,
+      loadPageSchema: defaultPageSchema,
     });
     const customSchemaIds = getCustomSchemaIds(schemaIds);
 

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -223,7 +223,7 @@ interface SchemaUtil {
     ) => Promise<Record<string, string>>;
     dereferenceSchemas: (
       schemaGlobs: string[],
-      loadPageSchema: boolean
+      defaultPageSchema: boolean
     ) => Promise<Record<string, JSONSchema.Interface>>;
     toStoryblok: (
       schemaGlobs: string[],