From 38509dd99cf9358a87a794f22c76039f489cf972 Mon Sep 17 00:00:00 2001 From: Jonas Ulrich | ruhmesmeile GmbH Date: Tue, 24 Sep 2024 16:18:12 +0200 Subject: [PATCH] fix(schema): option for page schema exclusion --- src/commands/schema/dereference.ts | 6 +++--- src/tasks/schema/dereference-task.ts | 4 ++-- src/util/schema.ts | 4 ++-- types/index.d.ts | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/commands/schema/dereference.ts b/src/commands/schema/dereference.ts index e10be23..bbe9065 100644 --- 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 index 410ae2b..c868f41 100644 --- 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 index d69a8a3..db619f2 100644 --- 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 index 5201236..3c25e3a 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -223,7 +223,7 @@ interface SchemaUtil { ) => Promise>; dereferenceSchemas: ( schemaGlobs: string[], - loadPageSchema: boolean + defaultPageSchema: boolean ) => Promise>; toStoryblok: ( schemaGlobs: string[],