Adjust layer ordering

package.json

@@ -101,12 +101,12 @@
     "@commitlint/config-conventional": "^16.2.1",
     "@kickstartds/eslint-config": "^1.2.0",
     "@kickstartds/style-dictionary": "^4.0.2",
-    "@kickstartds/jsonschema-utils": "^3.6.1",
-    "@kickstartds/jsonschema2staticcms": "^2.9.35",
-    "@kickstartds/jsonschema2stackbit": "^1.7.4",
-    "@kickstartds/jsonschema2storyblok": "^1.6.5",
-    "@kickstartds/jsonschema2types": "^1.2.3",
-    "@kickstartds/jsonschema2uniform": "^1.4.22",
+    "@kickstartds/jsonschema-utils": "^3.8.1",
+    "@kickstartds/jsonschema2staticcms": "^2.9.39",
+    "@kickstartds/jsonschema2stackbit": "^1.7.8",
+    "@kickstartds/jsonschema2storyblok": "^1.6.9",
+    "@kickstartds/jsonschema2types": "^1.2.7",
+    "@kickstartds/jsonschema2uniform": "^1.4.26",
     "@stackbit/types": "^0.10.14",
     "@types/byline": "^4.2.33",
     "@types/dockerode": "^3.3.9",
@@ -135,11 +135,11 @@
   "peerDependencies": {
     "@kickstartds/core": "^4.0.2",
     "@kickstartds/style-dictionary": "^4.0.2",
-    "@kickstartds/jsonschema-utils": "^3.6.1",
-    "@kickstartds/jsonschema2staticcms": "^2.9.35",
-    "@kickstartds/jsonschema2stackbit": "^1.7.4",
-    "@kickstartds/jsonschema2storyblok": "^1.6.5",
-    "@kickstartds/jsonschema2types": "^1.2.3",
-    "@kickstartds/jsonschema2uniform": "^1.4.22"
+    "@kickstartds/jsonschema-utils": "^3.8.1",
+    "@kickstartds/jsonschema2staticcms": "^2.9.39",
+    "@kickstartds/jsonschema2stackbit": "^1.7.8",
+    "@kickstartds/jsonschema2storyblok": "^1.6.9",
+    "@kickstartds/jsonschema2types": "^1.2.7",
+    "@kickstartds/jsonschema2uniform": "^1.4.26"
   }
 }

src/commands/cms/stackbit.ts

@@ -7,13 +7,14 @@ const stackbit = new Command('stackbit')
     chalkTemplate`Generates {bold Stackbit} configuration from your {bold JSON Schema} component definitions`
   )
   .option(
-    '--components-path <path>',
-    chalkTemplate`relative path from project root to your components directory, default {bold ./src/components}`,
-    'src/components'
+    '--schema-paths <paths...>',
+    chalkTemplate`paths to your JSON Schema component definitions, default {bold ./src/components}`,
+    ['src/components']
   )
   .option(
-    '--cms-path <path>',
-    chalkTemplate`relative path from project root to your cms specific components directory, default {bold ./src/components}`
+    '--layer-order <order...>',
+    chalkTemplate`order of layers in processing, default {bold ['cms', 'schema']}`,
+    ['cms', 'schema']
   )
   .option(
     '--configuration-path <path>',
@@ -67,8 +68,8 @@ const stackbit = new Command('stackbit')
   .action((options) =>
     import('./../../tasks/cms/stackbit-task.js').then((runTask) => {
       runTask.default(
-        options.componentsPath,
-        options.cmsPath,
+        options.schemaPaths,
+        options.layerOrder,
         options.configurationPath,
         options.updateConfig,
         options.templates,

src/commands/cms/staticcms.ts

@@ -7,13 +7,14 @@ const staticcms = new Command('staticcms')
     chalkTemplate`Generates {bold Static CMS} configuration from your {bold JSON Schema} component definitions`
   )
   .option(
-    '--components-path <path>',
-    chalkTemplate`relative path from project root to your components directory, default {bold ./src/components}`,
-    'src/components'
+    '--schema-paths <paths...>',
+    chalkTemplate`paths to your JSON Schema component definitions, default {bold ./src/components}`,
+    ['src/components']
   )
   .option(
-    '--cms-path <path>',
-    chalkTemplate`relative path from project root to your cms specific components directory, default {bold ./src/components}`
+    '--layer-order <order...>',
+    chalkTemplate`order of layers in processing, default {bold ['cms', 'schema']}`,
+    ['cms', 'schema']
   )
   .option(
     '--configuration-path <path>',
@@ -69,8 +70,8 @@ const staticcms = new Command('staticcms')
   .option('--debug', 'show debugging output', false)
   .action((options) => {
     runTask(
-      options.componentsPath,
-      options.cmsPath,
+      options.schemaPaths,
+      options.layerOrder,
       options.configurationPath,
       options.updateConfig,
       options.templates,

src/commands/cms/storyblok.ts

@@ -7,13 +7,14 @@ const storyblok = new Command('storyblok')
     chalkTemplate`Generates {bold Storyblok} configuration from your {bold JSON Schema} component definitions`
   )
   .option(
-    '--components-path <path>',
-    chalkTemplate`relative path from project root to your components directory, default {bold ./src/components}`,
-    'src/components'
+    '--schema-paths <paths...>',
+    chalkTemplate`paths to your JSON Schema component definitions, default {bold ./src/components}`,
+    ['src/components']
   )
   .option(
-    '--cms-path <path>',
-    chalkTemplate`relative path from project root to your cms specific components directory, default {bold ./src/components}`
+    '--layer-order <order...>',
+    chalkTemplate`order of layers in processing, default {bold ['cms', 'schema']}`,
+    ['cms', 'schema']
   )
   .option(
     '--configuration-path <path>',
@@ -66,8 +67,8 @@ const storyblok = new Command('storyblok')
   .option('--debug', 'show debugging output', false)
   .action((options) => {
     runTask(
-      options.componentsPath,
-      options.cmsPath,
+      options.schemaPaths,
+      options.layerOrder,
       options.configurationPath,
       options.updateConfig,
       options.templates,

src/commands/cms/uniform.ts

@@ -7,13 +7,14 @@ const uniform = new Command('uniform')
     chalkTemplate`Generates {bold Uniform} configuration from your {bold JSON Schema} component definitions`
   )
   .option(
-    '--components-path <path>',
-    chalkTemplate`relative path from project root to your components directory, default {bold ./src/components}`,
-    'src/components'
+    '--schema-paths <paths...>',
+    chalkTemplate`paths to your JSON Schema component definitions, default {bold ./src/components}`,
+    ['src/components']
   )
   .option(
-    '--cms-path <path>',
-    chalkTemplate`relative path from project root to your cms specific components directory, default {bold ./src/components}`
+    '--layer-order <order...>',
+    chalkTemplate`order of layers in processing, default {bold ['cms', 'schema']}`,
+    ['cms', 'schema']
   )
   .option(
     '--configuration-path <path>',
@@ -44,8 +45,8 @@ const uniform = new Command('uniform')
   .option('--debug', 'show debugging output', false)
   .action((options) => {
     runTask(
-      options.componentsPath,
-      options.cmsPath,
+      options.schemaPaths,
+      options.layerOrder,
       options.configurationPath,
       options.templates,
       options.globals,

src/commands/schema/defaults.ts

@@ -7,13 +7,14 @@ const defaults = new Command('defaults')
     chalkTemplate`Creates default objects for {bold JSON Schema} component definitions`
   )
   .option(
-    '--components-path <path>',
-    chalkTemplate`relative path from project root to your components directory, default {bold ./src/components}`,
-    'src/components'
+    '--schema-paths <paths...>',
+    chalkTemplate`paths to your JSON Schema component definitions, default {bold ./src/components}`,
+    ['src/components']
   )
   .option(
-    '--cms-path <path>',
-    chalkTemplate`relative path from project root to your cms specific components directory, default {bold ./src/components}`
+    '--layer-order <order...>',
+    chalkTemplate`order of layers in processing, default {bold ['cms', 'schema']}`,
+    ['cms', 'schema']
   )
   .option(
     '--no-default-page-schema',
@@ -38,8 +39,8 @@ const defaults = new Command('defaults')
   .option('--debug', 'show debugging output', false)
   .action((options) => {
     runTask(
-      options.componentsPath,
-      options.cmsPath,
+      options.schemaPaths,
+      options.layerOrder,
       options.defaultPageSchema,
       options.layerKickstartdsComponents,
       options.rcOnly,

src/commands/schema/dereference.ts

@@ -7,13 +7,14 @@ const dereference = new Command('dereference')
     chalkTemplate`Dereferences {bold JSON Schema} component definitions, (mainly) inlining all $ref references in the process`
   )
   .option(
-    '--components-path <path>',
-    chalkTemplate`relative path from project root to your components directory, default {bold ./src/components}`,
-    'src/components'
+    '--schema-paths <paths...>',
+    chalkTemplate`paths to your JSON Schema component definitions, default {bold ./src/components}`,
+    ['src/components']
   )
   .option(
-    '--cms-path <path>',
-    chalkTemplate`relative path from project root to your cms specific components directory, default {bold ./src/components}`
+    '--layer-order <order...>',
+    chalkTemplate`order of layers in processing, default {bold ['cms', 'schema']}`,
+    ['cms', 'schema']
   )
   .option(
     '--no-default-page-schema',
@@ -38,8 +39,8 @@ const dereference = new Command('dereference')
   .option('--debug', 'show debugging output', false)
   .action((options) => {
     runTask(
-      options.componentsPath,
-      options.cmsPath,
+      options.schemaPaths,
+      options.layerOrder,
       options.defaultPageSchema,
       options.layerKickstartdsComponents,
       options.rcOnly,

src/commands/schema/layer.ts

@@ -7,13 +7,14 @@ const types = new Command('layer')
     chalkTemplate`Layers kickstartDS {bold TypeScript} type definitions using your {bold JSON Schema} component definitions`
   )
   .option(
-    '--components-path <path>',
-    chalkTemplate`relative path from project root to your components directory, default {bold ./src/components}`,
-    'src/components'
+    '--schema-paths <paths...>',
+    chalkTemplate`paths to your JSON Schema component definitions, default {bold ./src/components}`,
+    ['src/components']
   )
   .option(
-    '--cms-path <path>',
-    chalkTemplate`relative path from project root to your cms specific components directory, default {bold ./src/components}`
+    '--layer-order <order...>',
+    chalkTemplate`order of layers in processing, default {bold ['cms', 'schema']}`,
+    ['cms', 'schema']
   )
   .option(
     '--types-path <path>',
@@ -48,8 +49,8 @@ const types = new Command('layer')
   .option('--debug', 'show debugging output', false)
   .action((options) => {
     runTask(
-      options.componentsPath,
-      options.cmsPath,
+      options.schemaPaths,
+      options.layerOrder,
       options.typesPath,
       options.mergeSchemas,
       options.defaultPageSchema,

src/commands/schema/types.ts

@@ -12,8 +12,14 @@ const types = new Command('types')
     'src/components'
   )
   .option(
-    '--cms-path <path>',
-    chalkTemplate`relative path from project root to your cms specific components directory, default {bold ./src/components}`
+    '--schema-paths <paths...>',
+    chalkTemplate`paths to your JSON Schema component definitions, default {bold ./src/components}`,
+    ['src/components']
+  )
+  .option(
+    '--layer-order <order...>',
+    chalkTemplate`order of layers in processing, default {bold ['cms', 'schema']}`,
+    ['cms', 'schema']
   )
   .option(
     '--merge-schemas',
@@ -49,7 +55,8 @@ const types = new Command('types')
   .action((options) => {
     runTask(
       options.componentsPath,
-      options.cmsPath,
+      options.schemaPaths,
+      options.layerOrder,
       options.mergeSchemas,
       options.defaultPageSchema,
       options.layerKickstartdsComponents,

src/tasks/cms/stackbit-task.ts

@@ -34,8 +34,8 @@ const {
 } = taskUtilSchema;
 
 const run = async (
-  componentsPath: string = 'src/components',
-  cmsPath: string,
+  schemaPaths: string[] = ['src/components'],
+  layerOrder: string[] = ['cms', 'schema'],
   configurationPath: string = 'src/cms',
   updateConfig: boolean = true,
   templates: string[] = ['page', 'blog-post'],
@@ -75,16 +75,19 @@ const run = async (
   const stackbit = async (logger: winston.Logger): Promise<boolean> => {
     logger.info(chalkTemplate`running the {bold stackbit} subtask`);
 
-    const customSchemaGlob = `${callingPath}/${componentsPath}/**/*.(schema|definitions|interface).json`;
-    const globs = [customSchemaGlob];
-    if (cmsPath) {
-      globs.push(`${callingPath}/${cmsPath}/**/*.schema.json`);
+    const globs = [];
+    for (const schemaPath of schemaPaths) {
+      globs.push(
+        `${callingPath}/${schemaPath}/**/*.(schema|definitions|interface).json`
+      );
     }
+
     const elements = await schemaToStackbit(
       globs,
       templates,
       globals,
-      components
+      components,
+      [...layerOrder, 'kickstartds']
     );
 
     shell.mkdir('-p', `${shell.pwd()}/${configurationPath}/`);

src/tasks/cms/staticcms-task.ts

@@ -35,8 +35,8 @@ const {
 } = taskUtilSchema;
 
 const run = async (
-  componentsPath: string = 'src/components',
-  cmsPath: string,
+  schemaPaths: string[] = ['src/components'],
+  layerOrder: string[] = ['cms', 'schema'],
   configurationPath: string = 'src/cms',
   updateConfig: boolean = true,
   templates: string[] = ['page', 'blog-post'],
@@ -73,16 +73,19 @@ const run = async (
   const staticcms = async (logger: winston.Logger): Promise<boolean> => {
     logger.info(chalkTemplate`running the {bold staticcms} subtask`);
 
-    const customSchemaGlob = `${callingPath}/${componentsPath}/**/*.(schema|definitions|interface).json`;
-    const globs = [customSchemaGlob];
-    if (cmsPath) {
-      globs.push(`${callingPath}/${cmsPath}/**/*.schema.json`);
+    const globs = [];
+    for (const schemaPath of schemaPaths) {
+      globs.push(
+        `${callingPath}/${schemaPath}/**/*.(schema|definitions|interface).json`
+      );
     }
+
     const elements = await schemaToStaticcms(
       globs,
       templates,
       globals,
-      components
+      components,
+      [...layerOrder, 'kickstartds']
     );
 
     shell.mkdir('-p', `${shell.pwd()}/${configurationPath}/`);

src/tasks/cms/storyblok-task.ts

@@ -34,8 +34,8 @@ const {
 } = taskUtilSchema;
 
 const run = async (
-  componentsPath: string = 'src/components',
-  cmsPath: string,
+  schemaPaths: string[] = ['src/components'],
+  layerOrder: string[] = ['cms', 'schema'],
   configurationPath: string = 'src/cms',
   updateConfig: boolean = true,
   templates: string[] = ['page', 'blog-post', 'blog-overview', 'settings'],
@@ -72,16 +72,19 @@ const run = async (
   const storyblok = async (logger: winston.Logger): Promise<boolean> => {
     logger.info(chalkTemplate`running the {bold storyblok} subtask`);
 
-    const customSchemaGlob = `${callingPath}/${componentsPath}/**/*.(schema|definitions|interface).json`;
-    const globs = [customSchemaGlob];
-    if (cmsPath) {
-      globs.push(`${callingPath}/${cmsPath}/**/*.schema.json`);
+    const globs = [];
+    for (const schemaPath of schemaPaths) {
+      globs.push(
+        `${callingPath}/${schemaPath}/**/*.(schema|definitions|interface).json`
+      );
     }
+
     const elements = await schemaToStoryblok(
       globs,
       templates,
       globals,
-      components
+      components,
+      [...layerOrder, 'kickstartds']
     );
 
     shell.mkdir('-p', `${shell.pwd()}/${configurationPath}/`);