store config per section

Author: destitutus

src/lib/assignment.ts

@@ -23,12 +23,20 @@ type YamlRaw = {
   withChildren: boolean | undefined
 }
 
+export type SectionConfig = {
+  withChildren: boolean
+}
+
+export function sectionToKey(section: string[]) {
+  return section.join('\n')
+}
+
 type Yaml = {
   assignment: string | undefined
   assignmentName: string | undefined
   paths: (string | PathMap)[]
   section: string[][]
-  withChildren: boolean
+  sectionConfig: Map<string, SectionConfig>
 }
 
 export type TimeExtension = {
@@ -194,21 +202,24 @@ function validityState(ymls: YamlRaw[]): Yaml[] {
     if (assignmentId === undefined) {
       throw new Error('assignment and assignmentName does not exist')
     }
+      const withChildren = yml.withChildren !== false
     if (map.has(assignmentId)) {
       const item = map.get(assignmentId)
       if (!item) {
         continue
       }
       item.section.push(section)
       item.paths = item.paths.concat(yml.paths || [])
+      item.sectionConfig.set(sectionToKey(section), {withChildren: withChildren})
     } else {
-      const withChildren = yml.withChildren !== false
+      const sectionConfig: Map<string, SectionConfig> = new Map()
+      sectionConfig.set(sectionToKey(section), {withChildren: withChildren})
       map.set(assignmentId, {
         assignment: yml.assignment,
         assignmentName: yml.assignmentName,
         paths: yml.paths || [],
         section: [section],
-        withChildren: withChildren
+        sectionConfig: sectionConfig
       })
     }
   }
@@ -232,13 +243,14 @@ function validateYmlCfg(ymls: Yaml[]): Yaml[] {
       }
       item.section = item.section.concat(section)
       item.paths = item.paths.concat(yml.paths || [])
+      item.sectionConfig = yml.sectionConfig
     } else {
       map.set(assignmentId, {
         assignment: yml.assignment,
         assignmentName: yml.assignmentName,
         paths: yml.paths || [],
         section: section,
-        withChildren: yml.withChildren
+        sectionConfig: yml.sectionConfig
       })
     }
   }
@@ -301,7 +313,7 @@ async function reducePublish(courseId: string, srcDir: string, yamlDir: string,
     if (!item.assignment) {
       throw new Error(`assignment not found with name "${item.assignmentName}"`)
     }
-    await tools.reduce(srcDir, tmpDstDir, item.section, _.compact(paths), item.withChildren)
+    await tools.reduce(srcDir, tmpDstDir, item.section, _.compact(paths), item.sectionConfig)
     await assignment.publish(courseId, item.assignment, tmpDstDir, changelogOrOptions)
     fs.rmSync(tmpDstDir, {recursive: true})
   }

src/lib/tools.ts

@@ -7,7 +7,7 @@ import {excludePaths} from './config'
 import tar from 'tar'
 import { ZSTDCompress } from 'simple-zstd'
 import config from './config'
-import { PathMap } from './assignment'
+import { PathMap, SectionConfig, sectionToKey } from './assignment'
 
 const CONVERTER_VERSION = '4ca4944ddf9d4fe4df9697bec06cbd0a6c170419'
 const GUIDES_CONTENT_DIR = '.guides/content'
@@ -22,14 +22,15 @@ export async function fixGuidesVersion(projectPath: string) {
 }
 
 export async function reduce(
-  srcDir: string, dstDir: string, yaml_sections: string[][], paths: (string | PathMap)[], withChildren=true
+  srcDir: string, dstDir: string, yaml_sections: string[][],
+  paths: (string | PathMap)[], sectionConfig: Map<string, SectionConfig> = new Map()
 ): Promise<void> {
   await fixGuidesVersion(srcDir)
   const contentDir = path.join(srcDir, GUIDES_CONTENT_DIR)
   const rootMetadataPath = path.join(contentDir, INDEX_METADATA_FILE)
   const rootMetadata = readMetadataFile(rootMetadataPath)
   const guidesStructure = getGuidesStructure(rootMetadata, srcDir, '')
-  const filter = collectFilter(guidesStructure, _.cloneDeep(yaml_sections), withChildren)
+  const filter = collectFilter(guidesStructure, _.cloneDeep(yaml_sections), sectionConfig)
   const strippedStructure = stripStructure(guidesStructure, filter)
   const strippedSectionsIds = getStrippedSectionIds(strippedStructure)
   const excludePaths = getExcludedPaths(guidesStructure, strippedSectionsIds)
@@ -84,7 +85,7 @@ const DEFAULT_ALL_SECTION: Section = {
   children: {}
 }
 
-function collectFilter(guidesStructure, yaml_sections, withChildren: boolean) {
+function collectFilter(guidesStructure, yaml_sections: string[][], sectionConfig: Map<string, SectionConfig>) {
   const filterMap = {
     all: false,
     children: {}
@@ -94,7 +95,8 @@ function collectFilter(guidesStructure, yaml_sections, withChildren: boolean) {
     if (sectionPath.length === 0) {
       continue
     }
-    const section = traverseItems(guidesStructure, sectionPath, filterMap, withChildren)
+    const withChildren = sectionConfig.has(sectionToKey(sectionPath)) ? sectionConfig.get(sectionToKey(sectionPath))?.withChildren : true
+    const section = traverseItems(guidesStructure, sectionPath, filterMap, withChildren??true)
     if (!section) {
       throw new Error(`${section} not found`)
     }