@01-edu/shared 1.2.15 → 1.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@01-edu/shared",
-  "version": "1.2.15",
+  "version": "1.2.17",
   "type": "module",
   "description": "",
   "scripts": {

package/programming-languages.js

@@ -1,19 +1,13 @@
 // because of the nature of esbuild we have to put the import string hard coded
 export const langTypeInfo = {
-  go: {
-    legacy: true,
-    lang: 'go',
-    load: () => import('@codemirror/legacy-modes/mode/go'),
-  },
-  sh: {
-    legacy: true,
-    lang: 'shell',
-    load: () => import('@codemirror/legacy-modes/mode/shell'),
-  },
+  go: { lang: 'go', load: () => import('@codemirror/lang-go') },
+  bash: { lang: 'bash', load: () => import('@fig/lezer-bash') },
+  sh: { lang: 'shell', load: () => import('@fig/lezer-bash') },
+  // The `label` is used for the UI (StatusBar) so it still shows "dart" instead of "javascript"
   dart: {
-    lang: 'dart',
-    legacy: true,
-    load: () => import('@codemirror/legacy-modes/mode/clike'),
+    label: 'dart',
+    lang: 'javascript',
+    load: () => import('@codemirror/lang-javascript'),
   },
   css: { lang: 'css', load: () => import('@codemirror/lang-css') },
   html: { lang: 'html', load: () => import('@codemirror/lang-html') },

package/skill-definitions.js

@@ -5,6 +5,16 @@ export const skillsSet = {
     description: 'Basics of computer programming',
     type: 'technical',
   },
+  'intermediate-prog': {
+    name: 'Intermediate programming',
+    description: 'Intermediate notions of computer programming',
+    type: 'technical',
+  },
+  'advanced-prog': {
+    name: 'Advanced programming',
+    description: 'Advanced notions of computer programming',
+    type: 'technical',
+  },
   algo: {
     name: 'Elementary algorithms',
     description: 'Problem-solving, algorithm design',

package/toolbox.js

@@ -175,9 +175,14 @@ export const timeUnits = [
 ]
 export const formatedDuration = (
   seconds,
-  { noSeconds, stopFirst, useFullLabel } = {},
+  { noSeconds, stopFirst, useFullLabel, stopLabel } = {},
 ) => {
   const parts = []
+  if (
+    stopLabel &&
+    seconds < timeUnits.find(u => u.fullLabel === stopLabel)?.size
+  )
+    return `less than 1${useFullLabel ? ` ${stopLabel}` : timeUnits.find(u => u.fullLabel === stopLabel).label}`
   for (const { label, size, fullLabel } of timeUnits) {
     const value = Math.floor(seconds / size)
     if (value !== 0) {
@@ -187,6 +192,9 @@ export const formatedDuration = (
       if (stopFirst) return parts
       seconds -= value * size
     }
+    if (fullLabel === stopLabel) {
+      return parts.join(' ') || (noSeconds ? '0m' : '0s')
+    }
   }
   if (!noSeconds && seconds !== 0) {
     parts.push(`${seconds}s`)
@@ -533,3 +541,31 @@ export const createFrequencyMap = arr =>
     map[item] = (map[item] || 0) + 1
     return map
   }, {})
+
+export const postgresIntervalToMS = intervalStr => {
+  if (!intervalStr) return 0
+  // Regex to capture years, months, days, hours, minutes, seconds
+  const regex =
+    /(?:(\d+)\s+years?)?\s*(?:(\d+)\s+mons?)?\s*(?:(\d+)\s+days?)?\s*(?:(\d+):(\d+):([\d.]+))?/
+  const match = intervalStr.match(regex)
+
+  if (!match) return 0
+
+  const years = Number.parseInt(match[1] || 0, 10)
+  const months = Number.parseInt(match[2] || 0, 10)
+  const days = Number.parseInt(match[3] || 0, 10)
+  const hours = Number.parseInt(match[4] || 0, 10)
+  const minutes = Number.parseInt(match[5] || 0, 10)
+  const seconds = Number.parseFloat(match[6] || 0)
+
+  // Convert everything to milliseconds
+  const ms =
+    years * 365 * 24 * 60 * 60 * 1000 + // assume 1 year = 365 days
+    months * 30 * 24 * 60 * 60 * 1000 + // assume 1 month = 30 days
+    days * 24 * 60 * 60 * 1000 +
+    hours * 60 * 60 * 1000 +
+    minutes * 60 * 1000 +
+    seconds * 1000
+
+  return ms
+}