lancer-shared 1.2.259 → 1.2.261

package/dist/bundle.cjs.js

@@ -6769,12 +6769,13 @@ const leadSchema = upworkJobSchema
     biddedAt: numberType().nullable(),
     biddingTaskScheduled: booleanType().nullable(),
     scheduledBiddingTime: numberType().nullable(),
+    inQueue: booleanType().nullable(),
+    biddingDelayInMinutes: numberType().nullable(),
     wonAmount: numberType().optional(),
     feedbackCheckTaskId: stringType().nullable(),
     bidDecision: z.enum(['proceeded', 'rejected']).nullable(),
     rejectedFeedback: stringType().nullable(),
     applicationId: stringType().nullable(),
-    campaignName: stringType().optional(),
 })
     .omit({
     processed: true,
@@ -6813,6 +6814,7 @@ const getCampaignLeadsRequestQuerySchema = z.object({
     limit: z.number().default(20).optional(),
     status: getCampaignLeadsStatusEnum.optional(),
     campaignId: z.string().optional(),
+    inQueue: z.boolean().optional(),
 });
 const getCampaignLeadsResponseSchema = z.object({
     data: z.array(leadSchema),
@@ -6997,6 +6999,21 @@ const onboardingProgressSchema = z.object({
     startCampaign: z.boolean(),
 });
 
+const getOrganizationLeadsStatusEnum = z.enum([
+    'all',
+    'suitable',
+    'contacted',
+    'viewed',
+    'replied',
+]);
+const getOrganizationLeadsRequestQuerySchema = z.object({
+    cursor: z.string().optional(),
+    limit: z.number().default(20).optional(),
+    status: getOrganizationLeadsStatusEnum.optional(),
+    campaignId: z.string().optional(),
+    inQueue: z.boolean().optional(),
+});
+
 const organizationTypeSchema = z.enum(['agency', 'freelancer']);
 const organizationTierEnum = z.enum(['free', 'premium']);
 const limitsSchema = objectType({
@@ -7484,7 +7501,8 @@ const SearchFieldsSchema = z.object({
     anyWords: z.string().default(''),
     noneWords: z.string().default(''),
     exactPhrase: z.string().default(''),
-    titleSearch: z.string().default(''),
+    titleSearch: z.string().default(''), // AND logic for titles
+    titleAny: z.string().default(''), // OR logic for titles
     skillsSearch: z.string().default(''),
 });
 class SearchQueryBuilder {
@@ -7525,17 +7543,15 @@ class SearchQueryBuilder {
         if (validatedFields.exactPhrase.trim()) {
             parts.push(`"${validatedFields.exactPhrase.trim()}"`);
         }
-        // Field-specific searches - now support phrases too
+        // Title searches with proper AND/OR logic
         if (validatedFields.titleSearch.trim()) {
             const titleTerms = this.splitTerms(validatedFields.titleSearch);
             if (titleTerms.length === 1) {
-                // Single term or phrase
                 const term = titleTerms[0];
                 const isQuoted = term.startsWith('"') && term.endsWith('"');
                 parts.push(isQuoted ? `title:${term}` : `title:"${term}"`);
             }
             else {
-                // Multiple terms - each gets title: prefix
                 const titleParts = titleTerms.map((term) => {
                     const isQuoted = term.startsWith('"') && term.endsWith('"');
                     return isQuoted ? `title:${term}` : `title:"${term}"`;
@@ -7543,6 +7559,21 @@ class SearchQueryBuilder {
                 parts.push(`(${titleParts.join(' AND ')})`);
             }
         }
+        if (validatedFields.titleAny.trim()) {
+            const titleTerms = this.splitTerms(validatedFields.titleAny);
+            if (titleTerms.length === 1) {
+                const term = titleTerms[0];
+                const isQuoted = term.startsWith('"') && term.endsWith('"');
+                parts.push(isQuoted ? `title:${term}` : `title:"${term}"`);
+            }
+            else {
+                const titleParts = titleTerms.map((term) => {
+                    const isQuoted = term.startsWith('"') && term.endsWith('"');
+                    return isQuoted ? `title:${term}` : `title:"${term}"`;
+                });
+                parts.push(`(${titleParts.join(' OR ')})`);
+            }
+        }
         if (validatedFields.skillsSearch.trim()) {
             const skillsTerms = this.splitTerms(validatedFields.skillsSearch);
             if (skillsTerms.length === 1) {
@@ -7575,7 +7606,9 @@ class SearchQueryBuilder {
         if (validatedFields.exactPhrase)
             descriptions.push(`Exact phrase: "${validatedFields.exactPhrase}"`);
         if (validatedFields.titleSearch)
-            descriptions.push(`In title: ${validatedFields.titleSearch}`);
+            descriptions.push(`Title (all): ${validatedFields.titleSearch}`);
+        if (validatedFields.titleAny)
+            descriptions.push(`Title (any): ${validatedFields.titleAny}`);
         if (validatedFields.skillsSearch)
             descriptions.push(`Skills: ${validatedFields.skillsSearch}`);
         return descriptions.length > 0 ? descriptions.join(' • ') : 'All results';
@@ -7593,24 +7626,6 @@ class SearchQueryBuilder {
             errors: result.error.errors.map((err) => `${err.path.join('.')}: ${err.message}`),
         };
     }
-    /**
-     * Test/demo method to show phrase handling
-     * Remove this in production
-     */
-    static examples() {
-        const testFields = {
-            allWords: 'react "senior developer" javascript',
-            anyWords: 'frontend "full stack" backend',
-            noneWords: 'junior "entry level"',
-            exactPhrase: 'tech lead',
-            titleSearch: 'software engineer',
-            skillsSearch: 'node.js',
-        };
-        console.log('Query:', this.buildQuery(testFields));
-        console.log('Description:', this.describe(testFields));
-        // Should produce:
-        // Query: (react AND "senior developer" AND javascript) AND (frontend OR "full stack" OR backend) AND NOT junior AND NOT "entry level" AND "tech lead" AND title:"software engineer" AND skills:"node.js"
-    }
     /**
      * Parse a query string back into SearchFields structure
      * Fixed to handle grouped NOT expressions correctly
@@ -7622,13 +7637,40 @@ class SearchQueryBuilder {
             noneWords: '',
             exactPhrase: '',
             titleSearch: '',
+            titleAny: '',
             skillsSearch: '',
         };
         if (!query || query.trim() === '*') {
             return result;
         }
         let remainingQuery = query.trim();
-        // 1. Extract field-specific searches first
+        // 1. FIRST: Extract grouped expressions like (title:"a" OR title:"b") or (title:"a" AND title:"b")
+        const titleGroupPattern = /\((title:"[^"]+"(?:\s+(?:OR|AND)\s+title:"[^"]+")+)\)/g;
+        const titleGroupMatches = [...remainingQuery.matchAll(titleGroupPattern)];
+        for (const match of titleGroupMatches) {
+            const groupContent = match[1]; // e.g., 'title:"developer" OR title:"expert"'
+            if (groupContent.includes(' OR ')) {
+                // Extract terms from OR group for titleAny
+                const terms = groupContent
+                    .split(/\s+OR\s+/)
+                    .map((term) => term.replace(/^title:"([^"]+)"$/, '"$1"'))
+                    .filter(Boolean);
+                result.titleAny = terms.join(' ');
+            }
+            else if (groupContent.includes(' AND ')) {
+                // Extract terms from AND group for titleSearch
+                const terms = groupContent
+                    .split(/\s+AND\s+/)
+                    .map((term) => term.replace(/^title:"([^"]+)"$/, '"$1"'))
+                    .filter(Boolean);
+                result.titleSearch = result.titleSearch
+                    ? `${result.titleSearch} ${terms.join(' ')}`
+                    : terms.join(' ');
+            }
+            // Remove the matched group from remaining query
+            remainingQuery = remainingQuery.replace(match[0], '').trim();
+        }
+        // 2. THEN: Extract individual title: and skills: patterns
         const fieldPatterns = [
             { field: 'titleSearch', pattern: /title:("([^"]+)"|([^\s)]+))/g },
             { field: 'skillsSearch', pattern: /skills:("([^"]+)"|([^\s)]+))/g },
@@ -7642,21 +7684,46 @@ class SearchQueryBuilder {
                     }
                     return match[3];
                 });
-                result[field] = terms.join(' ');
+                if (field === 'titleSearch') {
+                    result.titleSearch = result.titleSearch
+                        ? `${result.titleSearch} ${terms.join(' ')}`
+                        : terms.join(' ');
+                }
+                else {
+                    result[field] = terms.join(' ');
+                }
                 remainingQuery = remainingQuery.replace(pattern, '').trim();
             }
         }
-        // 2. Extract grouped field searches like title:(term1 AND term2)
+        // 3. Handle legacy grouped field searches like title:(term1 AND term2)
         const groupedFieldPattern = /(title|skills):\(([^)]+)\)/g;
         let groupMatch;
         while ((groupMatch = groupedFieldPattern.exec(remainingQuery)) !== null) {
-            const fieldName = groupMatch[1] === 'title' ? 'titleSearch' : 'skillsSearch';
+            const fieldType = groupMatch[1];
             const groupContent = groupMatch[2];
-            const terms = this.extractTermsFromGroup(groupContent, groupMatch[1]);
-            result[fieldName] = terms.join(' ');
+            if (fieldType === 'title') {
+                // Check if it's OR logic (titleAny) or AND logic (titleSearch)
+                if (groupContent.includes(' OR ')) {
+                    const terms = this.extractTermsFromGroup(groupContent, fieldType);
+                    result.titleAny = result.titleAny
+                        ? `${result.titleAny} ${terms.join(' ')}`
+                        : terms.join(' ');
+                }
+                else {
+                    const terms = this.extractTermsFromGroup(groupContent, fieldType);
+                    result.titleSearch = result.titleSearch
+                        ? `${result.titleSearch} ${terms.join(' ')}`
+                        : terms.join(' ');
+                }
+            }
+            else {
+                // skills logic remains the same
+                const terms = this.extractTermsFromGroup(groupContent, fieldType);
+                result.skillsSearch = terms.join(' ');
+            }
             remainingQuery = remainingQuery.replace(groupMatch[0], '').trim();
         }
-        // 3. **NEW** - Extract grouped NOT expressions FIRST: NOT (term1 OR term2 OR ...)
+        // 4. Extract grouped NOT expressions: NOT (term1 OR term2 OR ...)
         const groupedNotPattern = /NOT\s+\(([^)]+(?:\s+OR\s+[^)]+)+)\)/g;
         const groupedNotMatches = [...remainingQuery.matchAll(groupedNotPattern)];
         if (groupedNotMatches.length > 0) {
@@ -7666,7 +7733,7 @@ class SearchQueryBuilder {
                 .replace(groupedNotMatches[0][0], '')
                 .trim();
         }
-        // 4. Extract individual NOT terms (only if no grouped NOT was found)
+        // 5. Extract individual NOT terms (only if no grouped NOT was found)
         if (!result.noneWords) {
             const notPattern = /NOT\s+("([^"]+)"|([^\s)]+))/g;
             const notMatches = [...remainingQuery.matchAll(notPattern)];
@@ -7681,7 +7748,7 @@ class SearchQueryBuilder {
                 remainingQuery = remainingQuery.replace(notPattern, '').trim();
             }
         }
-        // 5. Process grouped expressions - DON'T clean up connectors first!
+        // 6. Process grouped expressions - DON'T clean up connectors first!
         // Extract OR groups (anyWords) - PROCESS FIRST
         const orGroupPattern = /\(([^)]+(?:\s+OR\s+[^)]+)+)\)/g;
         const orMatches = [...remainingQuery.matchAll(orGroupPattern)];
@@ -7700,14 +7767,14 @@ class SearchQueryBuilder {
         }
         // NOW clean up connectors after group processing
         remainingQuery = this.cleanupConnectors(remainingQuery);
-        // 6. Extract standalone quoted phrases (exactPhrase) - ONLY after all groups processed
+        // 7. Extract standalone quoted phrases (exactPhrase) - ONLY after all groups processed
         const standaloneQuotePattern = /(?:^|\s)("([^"]+)")(?=\s|$)/g;
         const quoteMatches = [...remainingQuery.matchAll(standaloneQuotePattern)];
         if (quoteMatches.length > 0) {
             result.exactPhrase = quoteMatches[0][2];
             remainingQuery = remainingQuery.replace(quoteMatches[0][1], '').trim();
         }
-        // 7. Handle remaining simple terms as allWords
+        // 8. Handle remaining simple terms as allWords
         if (remainingQuery) {
             const remainingTerms = this.splitTermsWithQuotes(remainingQuery);
             if (remainingTerms.length > 0) {
@@ -7790,6 +7857,7 @@ class SearchQueryBuilder {
         return query
             .replace(/\s+AND\s+/g, ' ')
             .replace(/\s+/g, ' ')
+            .replace(/\(\s*\)/g, '')
             .trim();
     }
     /**
@@ -24028,6 +24096,8 @@ exports.getCampaignLeadsResponseSchema = getCampaignLeadsResponseSchema;
 exports.getCampaignLeadsStatusEnum = getCampaignLeadsStatusEnum;
 exports.getMultiloginBrowserException = getMultiloginBrowserException;
 exports.getNextStatus = getNextStatus;
+exports.getOrganizationLeadsRequestQuerySchema = getOrganizationLeadsRequestQuerySchema;
+exports.getOrganizationLeadsStatusEnum = getOrganizationLeadsStatusEnum;
 exports.getPreviousStatus = getPreviousStatus;
 exports.getRouteWithoutAdminPrefix = getRouteWithoutAdminPrefix;
 exports.getSamplesRequestSchema = getSamplesRequestSchema;