@01-edu/shared 2.0.2 → 2.0.4

package/attrs-defs.js

@@ -8,7 +8,7 @@ import {
   numTime,
 } from './event-utils.js'
 import { flatGraphContents, getCoreOfSattelite, limitations } from './graph.js'
-import { onboardingTypes } from './onboarding.js'
+import { onboardingTypes } from './object-structure.ts'
 import { getObjectFromRelativePath } from './path.js'
 import { gamesScoring } from './score.js'
 import { hasRequiredSkills, skillsSet } from './skill-definitions.js'
@@ -3247,6 +3247,12 @@ const isPathStatusSucceeded = (path, object) => {
   }
 }
 
+const addVersionChain = (object, path) => {
+  const objReq = object.parent.children[path.slice('../'.length)]
+  const versions = objReq?.versions?.map(({ key }) => `../${key}`)
+  return versions?.length ? [path, ...versions] : [path]
+}
+
 /**
  * @throws This function throws an error if any of the required objects is invalid
  * @returns {bool} true if all the required objects are succeeded, false otherwise
@@ -3257,11 +3263,22 @@ const hasSucceededRequiredObjects = (requirements, object) => {
   const { objects } = requirements
   if (!objects || !objects.length) return true
 
+  // include the old versions
+  const processedObjects = objects.map(p =>
+    Array.isArray(p)
+      ? p.flatMap(path => addVersionChain(object, path))
+      : addVersionChain(object, p),
+  )
+
   // required objects are the ones that need to be done to unblock the current object
-  const requiredObjects = objects.filter(p => !Array.isArray(p) && Boolean(p))
+  const requiredObjects = processedObjects.filter(
+    p => !Array.isArray(p) && Boolean(p),
+  )
   // pathway objects represent the choices a student can take to unblock the current object
   // note: at least one object from each pathway must be successfully completed
-  const pathWayObjects = objects?.filter(p => Array.isArray(p) && Boolean(p))
+  const pathWayObjects = processedObjects?.filter(
+    p => Array.isArray(p) && Boolean(p),
+  )
 
   const hasSeccededRequiredObjects = requiredObjects.every(path =>
     isPathStatusSucceeded(path, object),

package/definitions-checker.js

@@ -1,5 +1,5 @@
 import { attributes, relationAttributes } from './attrs.js'
-import { childTypes, objectTypes } from './toolbox.js'
+import { childTypes, objectTypes } from './object-structure.ts'
 
 const normalize = str =>
   str
@@ -9,14 +9,22 @@ const normalize = str =>
     .replaceAll(' ', '-')
 
 const assertDef = def => {
-  const { type, name, attrs, children, childrenAttrs, referencePath, ...rest } =
-    def
+  const {
+    type,
+    name,
+    attrs,
+    children: _children,
+    childrenAttrs,
+    referencePath: _referencePath,
+    ...rest
+  } = def
   const [extra] = Object.keys(rest)
   if (extra) {
     throw Error(
       `Unexpected property ${extra}, did you mean to define an attribute ?`,
     )
   }
+  if (type === 'campus') throw Error(`Campuses can't be defined in definitions`)
   if (!objectTypes.has(type)) throw Error(`Invalid type property`)
   if (!name || typeof name !== 'string') throw Error(`Invalid name property`)
   if (!attrs || typeof attrs !== 'object' || Array.isArray(attrs)) {

package/object-structure.ts

@@ -0,0 +1,60 @@
+export const onboardingTypes = new Set([
+  'onboarding',
+  'piscine-registration',
+  'interview',
+  'games',
+  'administration',
+  'module-registration',
+  'form-step',
+  'sign-step',
+  'upload-step',
+  'contact-validation-step',
+  'avatar-step',
+] as const)
+
+type Extract<T> = [T] extends [Set<infer V>] ? V : never
+
+export const objectTypes = new Set([
+  'module',
+  'piscine',
+  'exam',
+  'raid',
+  'quest',
+  'exercise',
+  'project',
+  'signup',
+  'campus',
+  ...onboardingTypes,
+] as const)
+
+export type ObjectType = Extract<typeof objectTypes>
+export const childTypes = {
+  campus: ['signup', 'onboarding', 'piscine', 'module'],
+  signup: [
+    'form-step',
+    'sign-step',
+    'upload-step',
+    'contact-validation-step',
+    'avatar-step',
+  ],
+  onboarding: [
+    'games',
+    'administration',
+    'interview',
+    'piscine-registration',
+    'module-registration',
+  ],
+  administration: [
+    'form-step',
+    'sign-step',
+    'upload-step',
+    'contact-validation-step',
+    'avatar-step',
+  ],
+  piscine: ['quest', 'exam', 'raid', 'project'],
+  exam: ['exercise'],
+  quest: ['exercise'],
+  module: ['project', 'piscine', 'exam'],
+} as const satisfies Partial<Record<ObjectType, ObjectType[]>>
+
+export type ChildTypes = typeof childTypes

package/onboarding.js

@@ -1,17 +1,3 @@
-export const onboardingTypes = new Set([
-  'onboarding',
-  'piscine-registration',
-  'interview',
-  'games',
-  'administration',
-  'module-registration',
-  'form-step',
-  'sign-step',
-  'upload-step',
-  'contact-validation-step',
-  'avatar-step',
-])
-
 export const prevValidated = (key, object) => {
   const { prev } = (
     object.parent.type !== 'onboarding' ? object : object.parent

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@01-edu/shared",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "type": "module",
   "description": "",
   "scripts": {
@@ -19,7 +19,8 @@
     "./programming-languages.js",
     "./score.js",
     "./skill-definitions.js",
-    "./toolbox.js"
+    "./toolbox.js",
+    "./object-structure.ts"
   ],
   "license": "Fair",
   "bin": {

package/toolbox.js

@@ -1,5 +1,4 @@
 import { isFinished } from './event-utils.js'
-import { onboardingTypes } from './onboarding.js'
 
 const keyCodes = {
   13: ({ save, value, event, allowLineBreak }) => {
@@ -11,48 +10,6 @@ const keyCodes = {
     event.metaKey || event.ctrlKey ? save(value) : false, // cmd+s
 }
 
-export const contentObjects = new Set([
-  'module',
-  'piscine',
-  'exam',
-  'raid',
-  'quest',
-  'exercise',
-  'project',
-  'signup',
-])
-
-export const objectTypes = new Set([...contentObjects, ...onboardingTypes])
-
-export const childTypes = {
-  campus: ['signup', 'onboarding', 'piscine', 'module'],
-  signup: [
-    'form-step',
-    'sign-step',
-    'upload-step',
-    'contact-validation-step',
-    'avatar-step',
-  ],
-  onboarding: [
-    'games',
-    'administration',
-    'interview',
-    'piscine-registration',
-    'module-registration',
-  ],
-  administration: [
-    'form-step',
-    'sign-step',
-    'upload-step',
-    'contact-validation-step',
-    'avatar-step',
-  ],
-  piscine: ['quest', 'exam', 'raid', 'project'],
-  exam: ['exercise'],
-  quest: ['exercise'],
-  module: ['project', 'piscine', 'exam'],
-}
-
 export const handleKeyDownEvent = args => {
   const handler = keyCodes[args.event.keyCode]