@shaxpir/duiduidui-models 1.8.0 → 1.8.2

package/dist/models/Condition.d.ts

@@ -37,7 +37,16 @@ export interface DifficultyCondition extends BaseCondition {
     min?: number;
     max?: number;
 }
-export type AnyCondition = TagCondition | GradeCondition | ThetaCondition | TemporalCondition | CountCondition | StarredCondition | DifficultyCondition;
+export interface HasTermCondition extends BaseCondition {
+    type: 'has_term';
+    value: boolean;
+}
+export interface ComponentCondition extends BaseCondition {
+    type: 'component';
+    components: string[];
+    mode: 'any' | 'all';
+}
+export type AnyCondition = TagCondition | GradeCondition | ThetaCondition | TemporalCondition | CountCondition | StarredCondition | DifficultyCondition | HasTermCondition | ComponentCondition;
 export interface ConditionFilters {
     all?: AnyCondition[];
     any?: AnyCondition[];
@@ -72,6 +81,11 @@ export declare const Condition: {
     intermediate: () => DifficultyCondition;
     advanced: () => DifficultyCondition;
     expert: () => DifficultyCondition;
+    hasTerm: () => HasTermCondition;
+    noTerm: () => HasTermCondition;
+    hasComponent: (component: string) => ComponentCondition;
+    hasAnyComponent: (components: string[]) => ComponentCondition;
+    hasAllComponents: (components: string[]) => ComponentCondition;
     /**
      * Check if starred condition is required (in 'all' section)
      */

package/dist/models/Condition.js

@@ -38,6 +38,13 @@ exports.Condition = {
     intermediate: () => ({ type: 'difficulty', min: 500, max: 1500 }), // Medium
     advanced: () => ({ type: 'difficulty', min: 1500, max: 3000 }), // Hard
     expert: () => ({ type: 'difficulty', min: 3000 }), // Very hard
+    // HasTerm conditions
+    hasTerm: () => ({ type: 'has_term', value: true }),
+    noTerm: () => ({ type: 'has_term', value: false }),
+    // Component conditions
+    hasComponent: (component) => ({ type: 'component', components: [component], mode: 'any' }),
+    hasAnyComponent: (components) => ({ type: 'component', components, mode: 'any' }),
+    hasAllComponents: (components) => ({ type: 'component', components, mode: 'all' }),
     // Helper methods to check if conditions are present in filters
     /**
      * Check if starred condition is required (in 'all' section)
@@ -129,6 +136,30 @@ exports.Condition = {
         if (allGrades.length > 1) {
             errors.push(`Cannot require multiple grades: ${allGrades.join(', ')} - an item can only have one grade`);
         }
+        // Check for contradictory has_term conditions
+        const requiresTerm = filters.all?.some(c => c.type === 'has_term' && c.value === true);
+        const excludesTerm = filters.all?.some(c => c.type === 'has_term' && c.value === false);
+        if (requiresTerm && excludesTerm) {
+            errors.push('Cannot require both has_term and no_term');
+        }
+        // Check for implicit term requirements conflicting with no_term
+        const termDependentTypes = ['grade', 'theta', 'starred', 'temporal', 'count'];
+        const hasTermDependentInAll = filters.all?.some(c => termDependentTypes.includes(c.type));
+        const hasTermDependentInAny = filters.any?.some(c => termDependentTypes.includes(c.type));
+        if (excludesTerm && hasTermDependentInAll) {
+            const conflictingTypes = filters.all
+                ?.filter(c => termDependentTypes.includes(c.type))
+                .map(c => c.type)
+                .join(', ');
+            errors.push(`Conditions [${conflictingTypes}] require a term record, but has_term is false`);
+        }
+        if (excludesTerm && hasTermDependentInAny) {
+            const conflictingTypes = filters.any
+                ?.filter(c => termDependentTypes.includes(c.type))
+                .map(c => c.type)
+                .join(', ');
+            errors.push(`Conditions [${conflictingTypes}] in 'any' section require a term record, but has_term is false`);
+        }
         return errors;
     },
     // Backward compatibility aliases (deprecated - use requiresStarred/allowsStarred/excludesStarred instead)

package/dist/models/SkillLevel.js

@@ -74,7 +74,7 @@ class SkillLevelModel {
         const z = confidence === 0.95 ? 1.96 : confidence === 0.99 ? 2.58 : 1.96;
         return {
             lower: Math.max(0, rating - z * ratingDeviation),
-            upper: rating + z * ratingDeviation
+            upper: Math.max(0, rating + z * ratingDeviation)
         };
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shaxpir/duiduidui-models",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/shaxpir/duiduidui-models"