@shaxpir/duiduidui-models 1.10.1 → 1.10.2

package/dist/models/Condition.d.ts

@@ -51,11 +51,7 @@ export interface RecordTypeCondition extends BaseCondition {
     type: 'record_type';
     recordType: RecordType;
 }
-export interface ExcludeRecordTypeCondition extends BaseCondition {
-    type: 'exclude_record_type';
-    recordType: RecordType;
-}
-export type AnyCondition = TagCondition | GradeCondition | ThetaCondition | TemporalCondition | CountCondition | StarredCondition | DifficultyCondition | HasTermCondition | ComponentCondition | RecordTypeCondition | ExcludeRecordTypeCondition;
+export type AnyCondition = TagCondition | GradeCondition | ThetaCondition | TemporalCondition | CountCondition | StarredCondition | DifficultyCondition | HasTermCondition | ComponentCondition | RecordTypeCondition;
 export interface Conditions {
     all?: AnyCondition[];
     any?: AnyCondition[];
@@ -97,7 +93,6 @@ export declare const Condition: {
     hasAnyComponent: (components: string[]) => ComponentCondition;
     hasAllComponents: (components: string[]) => ComponentCondition;
     recordType: (recordType: RecordType) => RecordTypeCondition;
-    excludeRecordType: (recordType: RecordType) => ExcludeRecordTypeCondition;
     strokes: () => RecordTypeCondition;
     radicals: () => RecordTypeCondition;
     characters: () => RecordTypeCondition;
@@ -154,8 +149,7 @@ export declare const Condition: {
     getIncludedRecordTypes: (conditions?: Conditions) => RecordType[] | null;
     /**
      * Extract excluded record types from conditions.
-     * Returns an array of types to exclude based on exclude_record_type conditions in 'all'
-     * or record_type conditions in 'none'.
+     * Returns an array of types to exclude based on record_type conditions in 'none'.
      */
     getExcludedRecordTypes: (conditions?: Conditions) => RecordType[];
     /**
@@ -163,7 +157,7 @@ export declare const Condition: {
      */
     requiresRecordType: (conditions: Conditions | undefined, recordType: RecordType) => boolean;
     /**
-     * Check if a specific record type is excluded
+     * Check if a specific record type is excluded (record_type in 'none' section)
      */
     excludesRecordType: (conditions: Conditions | undefined, recordType: RecordType) => boolean;
     /**

package/dist/models/Condition.js

@@ -47,8 +47,9 @@ exports.Condition = {
     hasAnyComponent: (components) => ({ type: 'component', components, mode: 'any' }),
     hasAllComponents: (components) => ({ type: 'component', components, mode: 'all' }),
     // Record type conditions
+    // To include specific types: put recordType in 'all' or 'any'
+    // To exclude specific types: put recordType in 'none'
     recordType: (recordType) => ({ type: 'record_type', recordType }),
-    excludeRecordType: (recordType) => ({ type: 'exclude_record_type', recordType }),
     // Convenience methods for common record types
     strokes: () => ({ type: 'record_type', recordType: 'stroke' }),
     radicals: () => ({ type: 'record_type', recordType: 'radical' }),
@@ -187,9 +188,6 @@ exports.Condition = {
         const noneRecordTypes = conditions.none
             ?.filter(c => c.type === 'record_type')
             .map(c => c.recordType) || [];
-        const excludedRecordTypes = conditions.all
-            ?.filter(c => c.type === 'exclude_record_type')
-            .map(c => c.recordType) || [];
         // Check for multiple required record types (an item can only have one record type)
         if (allRecordTypes.length > 1) {
             errors.push(`Cannot require multiple record types: ${allRecordTypes.join(', ')} - an item can only have one record type`);
@@ -200,12 +198,6 @@ exports.Condition = {
                 errors.push(`Record type "${rt}" cannot be both required and excluded`);
             }
         });
-        // Check for record_type in 'all' conflicting with exclude_record_type for same type
-        allRecordTypes.forEach(rt => {
-            if (excludedRecordTypes.includes(rt)) {
-                errors.push(`Record type "${rt}" cannot be both required (record_type) and excluded (exclude_record_type)`);
-            }
-        });
         // Check if all record types would be excluded (empty result set)
         const effectiveTypes = exports.Condition.getEffectiveRecordTypes(conditions);
         if (effectiveTypes.length === 0) {
@@ -242,24 +234,15 @@ exports.Condition = {
     },
     /**
      * Extract excluded record types from conditions.
-     * Returns an array of types to exclude based on exclude_record_type conditions in 'all'
-     * or record_type conditions in 'none'.
+     * Returns an array of types to exclude based on record_type conditions in 'none'.
      */
     getExcludedRecordTypes: (conditions) => {
         if (!conditions)
             return [];
-        const excluded = [];
-        // Check 'all' section for exclude_record_type conditions
-        const allExclusions = conditions.all
-            ?.filter(c => c.type === 'exclude_record_type')
-            .map(c => c.recordType) || [];
-        excluded.push(...allExclusions);
         // Check 'none' section for record_type conditions (these types should be excluded)
-        const noneRecordTypes = conditions.none
+        return conditions.none
             ?.filter(c => c.type === 'record_type')
             .map(c => c.recordType) || [];
-        excluded.push(...noneRecordTypes);
-        return [...new Set(excluded)]; // Deduplicate
     },
     /**
      * Check if a specific record type is required (in 'all' section)
@@ -268,14 +251,10 @@ exports.Condition = {
         return !!(conditions?.all?.some(c => c.type === 'record_type' && c.recordType === recordType));
     },
     /**
-     * Check if a specific record type is excluded
+     * Check if a specific record type is excluded (record_type in 'none' section)
      */
     excludesRecordType: (conditions, recordType) => {
-        // Check exclude_record_type in 'all'
-        const hasExcludeCondition = conditions?.all?.some(c => c.type === 'exclude_record_type' && c.recordType === recordType);
-        // Check record_type in 'none'
-        const hasNoneCondition = conditions?.none?.some(c => c.type === 'record_type' && c.recordType === recordType);
-        return !!(hasExcludeCondition || hasNoneCondition);
+        return !!(conditions?.none?.some(c => c.type === 'record_type' && c.recordType === recordType));
     },
     /**
      * Get the effective record types to query based on conditions.

package/dist/util/ConditionMatcher.js

@@ -129,16 +129,6 @@ exports.ConditionMatcher = {
                 }
                 return itemType === rtCond.recordType;
             }
-            case 'exclude_record_type': {
-                const ertCond = condition;
-                // Try to get type directly, or derive from phrase_id
-                const itemType = item.type ?? (item.phrase_id !== undefined ? (0, RecordType_1.getRecordTypeFromId)(item.phrase_id) : null);
-                if (itemType === null) {
-                    // Cannot determine type - user-created term without type, return true (don't filter out)
-                    return true;
-                }
-                return itemType !== ertCond.recordType;
-            }
             default:
                 // For unsupported conditions, default to true (don't filter out)
                 return true;

package/package.json

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