musora-content-services 2.102.1 → 2.102.3

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.102.3](https://github.com/railroadmedia/musora-content-services/compare/v2.102.2...v2.102.3) (2025-12-11)
+
+
+### Bug Fixes
+
+* **agi:** rollback total on fetchAGILessons ([a02be05](https://github.com/railroadmedia/musora-content-services/commit/a02be0592dd8b195da7971f13ea062674510c8bb))
+
+### [2.102.2](https://github.com/railroadmedia/musora-content-services/compare/v2.102.1...v2.102.2) (2025-12-11)
+
+
+### Bug Fixes
+
+* **agi:** remove count from AGI lessons functions ([5cf3bc3](https://github.com/railroadmedia/musora-content-services/commit/5cf3bc3ade98faa5200cd64ce4b0a9edaff29d7a))
+
 ### [2.102.1](https://github.com/railroadmedia/musora-content-services/compare/v2.102.0...v2.102.1) (2025-12-10)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "2.102.1",
+  "version": "2.102.3",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "type": "module",
@@ -21,11 +21,12 @@
   },
   "homepage": "https://github.com/railroadmedia/musora-content-services#readme",
   "devDependencies": {
-    "@babel/preset-env": "^7.25.3",
     "@babel/plugin-transform-class-properties": "^7.27.1",
     "@babel/plugin-transform-object-rest-spread": "^7.28.0",
+    "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.27.1",
     "@sentry/browser": "^10.15.0",
+    "@types/jest": "^30.0.0",
     "babel-jest": "^29.7.0",
     "dotenv": "^16.4.5",
     "jest": "^29.7.0",

package/src/lib/sanity/filter.ts

@@ -0,0 +1,460 @@
+import { filtersToGroq } from '../../contentTypeConfig'
+import { getPermissionsAdapter } from '../../services/permissions/index'
+import type { UserPermissions } from '../../services/permissions/PermissionsAdapter'
+import { filterOps } from './query'
+
+// ============================================
+// TYPES & INTERFACES
+// ============================================
+//
+
+export type Prefix = '' | '@->' | '^.'
+
+export interface PermissionsConfig {
+  bypassPermissions?: boolean
+  showMembershipRestrictedContent?: boolean
+  showOnlyOwnedContent?: boolean
+  userData?: UserPermissions
+  prefix?: Prefix
+}
+
+export interface StatusConfig {
+  statuses?: string[]
+  bypassStatuses?: boolean
+  isSingle?: boolean
+  isAdmin?: boolean
+  prefix?: Prefix
+}
+
+export interface DateConfig {
+  bypassPublishedDate?: boolean
+  pullFutureContent?: boolean
+  getFutureContentOnly?: boolean
+  prefix?: Prefix
+}
+
+export interface ContentFilterConfig extends PermissionsConfig, StatusConfig, DateConfig {
+  prefix?: Prefix
+}
+
+// ============================================
+// CONSTANTS
+// ============================================
+
+const STATUS_SCHEDULED = 'scheduled'
+const STATUS_PUBLISHED = 'published'
+const STATUS_DRAFT = 'draft'
+const STATUS_ARCHIVED = 'archived'
+const STATUS_UNLISTED = 'unlisted'
+
+const CHILD_PREFIX: Prefix = '@->'
+const PARENT_PREFIX: Prefix = '^.'
+
+// ============================================
+// HELPER UTILITIES
+// ============================================
+
+const getRoundedTime = (): Date => {
+  const now = new Date()
+  return new Date(now.getFullYear(), now.getMonth(), now.getDate(), now.getHours(), 1)
+}
+
+const applyPrefix = (prefix: Prefix, filter: string): string => {
+  if (!prefix || !filter) return filter
+  // Replace field names with prefixed versions
+  return filter.replace(/\b([a-z_][a-z0-9_]*)\s*(==|!=|<=|>=|<|>|in|match)/gi, `${prefix}$1 $2`)
+}
+
+const arrayToStringRepresentation = (arr: string[]): string => {
+  return '[' + arr.map((item) => `'${item}'`).join(',') + ']'
+}
+
+// ============================================
+// MAIN FILTERS CLASS
+// ============================================
+
+export class Filters {
+  static empty = ''
+
+  // ============================================
+  // SIMPLE FILTERS (Synchronous)
+  // ============================================
+
+  /**
+   * @param {string} brand - The brand to filter by
+   * @returns {string} Filter expression
+   * @example Filters.brand('drumeo') // "brand == 'drumeo'"
+   */
+  static brand(brand: string): string {
+    return `brand == "${brand}"`
+  }
+
+  /**
+   * @param {string} type - The content type to filter by
+   * @returns {string} Filter expression
+   * @example Filters.type('song') // "_type == 'song'"
+   */
+  static type(type: string): string {
+    return `_type == "${type}"`
+  }
+
+  /**
+   * @param {string} slug - The slug to filter by
+   * @returns {string} Filter expression
+   * @example Filters.slug('guitar-basics') // "slug.current == 'guitar-basics'"
+   */
+  static slug(slug: string): string {
+    return `slug.current == "${slug}"`
+  }
+
+  /**
+   * @param {number} id - The railcontent_id to filter by
+   * @returns {string} Filter expression
+   * @example Filters.railcontentId(12345) // "railcontent_id == 12345"
+   */
+  static railcontentId(id: number): string {
+    return `railcontent_id == ${id}`
+  }
+
+  /**
+   * @param {string[]} statuses - Array of status values
+   * @returns {string} Filter expression
+   * @example Filters.statusIn(['published', 'scheduled']) // "status in ['published','scheduled']"
+   */
+  static statusIn(statuses: string[]): string {
+    return `status in ${arrayToStringRepresentation(statuses)}`
+  }
+
+  /**
+   * @param {number[]} ids - Array of railcontent_id values
+   * @returns {string} Filter expression
+   * @example Filters.idIn([123, 456, 789]) // "railcontent_id in [123,456,789]"
+   */
+  static idIn(ids: number[]): string {
+    return `railcontent_id in [${ids.join(',')}]`
+  }
+
+  /**
+   * @param {string} id - The document ID to reference
+   * @returns {string} Filter expression
+   * @example Filters.references('abc123') // "references('abc123')"
+   */
+  static references(id: string): string {
+    return `references("${id}")`
+  }
+
+  static referencesIDWithFilter(filter: string): string {
+    return `references(*[${filter}]._id)`
+  }
+
+  /**
+   * @returns {string} Filter expression
+   * @example Filters.referencesParent() // "references(^._id)"
+   */
+  static referencesParent(): string {
+    return `references(^._id)`
+  }
+
+  /**
+   * @param {string} field - The field to match in the reference query
+   * @param {string} value - The value to match
+   * @returns {string} Filter expression
+   * @example Filters.referencesField('slug.current', 'john-doe')
+   */
+  static referencesField(field: string, value: string): string {
+    return `references(*[${field} == "${value}"]._id)`
+  }
+
+  /**
+   * @param {string} term - The search term
+   * @returns {string} Filter expression
+   * @example Filters.titleMatch('guitar') // "title match 'guitar*'"
+   */
+  static titleMatch(term: string): string {
+    return `title match "${term}*"`
+  }
+
+  /**
+   * @param {string} field - The field to search in
+   * @param {string} term - The search term
+   * @returns {string} Filter expression
+   * @example Filters.searchMatch('description', 'beginner') // "description match 'beginner*'"
+   */
+  static searchMatch(field: string, term?: string): string {
+    return term ? `${field} match "${term}*"` : Filters.empty
+  }
+
+  /**
+   * @param {string} date - ISO date string
+   * @returns {string} Filter expression
+   * @example Filters.publishedBefore('2024-01-01') // "published_on <= '2024-01-01'"
+   */
+  static publishedBefore(date: string): string {
+    return `published_on <= "${date}"`
+  }
+
+  /**
+   * @param {string} date - ISO date string
+   * @returns {string} Filter expression
+   * @example Filters.publishedAfter('2024-01-01') // "published_on >= '2024-01-01'"
+   */
+  static publishedAfter(date: string): string {
+    return `published_on >= "${date}"`
+  }
+
+  /**
+   * @param {string} field - The field to check
+   * @returns {string} Filter expression
+   * @example Filters.defined('thumbnail') // "defined(thumbnail)"
+   */
+  static defined(field: string): string {
+    return `defined(${field})`
+  }
+
+  /**
+   * @param {string} field - The field to check
+   * @returns {string} Filter expression
+   * @example Filters.notDefined('thumbnail') // "!defined(thumbnail)"
+   */
+  static notDefined(field: string): string {
+    return `!defined(${field})`
+  }
+
+  /**
+   * @param {Prefix} [prefix=''] - Optional prefix for the field
+   * @returns {string} Filter expression
+   * @example Filters.notDeprecated() // "!defined(deprecated_railcontent_id)"
+   * @example Filters.notDeprecated('@->') // "!defined(@->deprecated_railcontent_id)"
+   */
+  static notDeprecated(prefix: Prefix = ''): string {
+    return `!defined(${prefix}deprecated_railcontent_id)`
+  }
+
+  // ============================================
+  // PREFIX MODIFIERS
+  // ============================================
+
+  /**
+   * @param {Prefix} prefix - The prefix to apply ('', '@->', '^.')
+   * @param {string} filter - The filter expression to prefix
+   * @returns {string} Filter expression with prefix applied
+   * @example Filters.withPrefix('@->', Filters.brand('drumeo'))
+   */
+  static withPrefix(prefix: Prefix, filter: string): string {
+    return applyPrefix(prefix, filter)
+  }
+
+  /**
+   * @param {string} filter - The filter expression to prefix
+   * @returns {string} Filter expression with child prefix (@->)
+   * @example Filters.asChild(Filters.statusIn(['published']))
+   */
+  static asChild(filter: string): string {
+    return applyPrefix(CHILD_PREFIX, filter)
+  }
+
+  /**
+   * @param {string} filter - The filter expression to prefix
+   * @returns {string} Filter expression with parent prefix (^.)
+   * @example Filters.asParent(Filters.brand('drumeo'))
+   */
+  static asParent(filter: string): string {
+    return applyPrefix(PARENT_PREFIX, filter)
+  }
+
+  // ============================================
+  // COMPOSITION UTILITIES
+  // ============================================
+
+  /**
+   * @param {...string} filters - Filter expressions to combine with AND
+   * @returns {string} Combined filter expression
+   * @example Filters.combine(Filters.brand('drumeo'), Filters.type('song'))
+   */
+  static combine(...filters: (string | undefined | null | false)[]): string {
+    return (filters.filter((f) => f) as string[]).reduce(filterOps.and.concat, filterOps.and.empty)
+  }
+
+  /**
+   * @param {...string} filters - Filter expressions to combine with OR
+   * @returns {string} Combined filter expression
+   * @example Filters.combineOr(Filters.type('song'), Filters.type('workout'))
+   */
+  static combineOr(...filters: (string | undefined | null | false)[]): string {
+    return (filters.filter((f) => f) as string[]).reduce(filterOps.or.concat, filterOps.or.empty)
+  }
+
+  /**
+   * @param {...(string | Promise<string>)} filters - Mix of synchronous filter expressions and promises
+   * @returns {Promise<string>} Promise that resolves to combined filter expression
+   * @example
+   * await Filters.combineAsync(
+   *   Filters.brand('drumeo'),
+   *   Filters.permissions({ bypassPermissions: false }),
+   *   Filters.status({ isSingle: false })
+   * )
+   */
+  static async combineAsync(
+    ...filters: (string | Promise<string> | undefined | null | false)[]
+  ): Promise<string> {
+    const resolved = (await Promise.all(
+      filters.map((f) => Promise.resolve(f)).filter((f) => f)
+    )) as string[]
+
+    return resolved.reduce(filterOps.and.concat, filterOps.and.empty)
+  }
+
+  /**
+   * @param {...(string | Promise<string>)} filters - Mix of synchronous filter expressions and promises
+   * @returns {Promise<string>} Promise that resolves to combined filter expression
+   * @example
+   * await Filters.combineOrAsync(
+   *   Filters.type('song'),
+   *   Filters.type('workout'),
+   *   Filters.permissions({ bypassPermissions: false })
+   * )
+   */
+  static async combineAsyncOr(
+    ...filters: (string | Promise<string> | undefined | null | false)[]
+  ): Promise<string> {
+    const resolved = (await Promise.all(
+      filters.map((f) => Promise.resolve(f)).filter((f) => f)
+    )) as string[]
+
+    return resolved.reduce(filterOps.or.concat, filterOps.or.empty)
+  }
+
+  // ============================================
+  // ASYNC FILTERS (Permission/Status based)
+  // ============================================
+
+  /**
+   * @param {PermissionsConfig} config - Permissions configuration
+   * @returns {Promise<string>} Filter expression based on user permissions
+   * @example await Filters.permissions({ bypassPermissions: false })
+   */
+  static async permissions(config: PermissionsConfig = {}): Promise<string> {
+    if (config.bypassPermissions) return ''
+
+    const adapter = getPermissionsAdapter()
+    const userData = config.userData || (await adapter.fetchUserPermissions())
+
+    if (adapter.isAdmin(userData)) return ''
+
+    const permissionsFilter = adapter.generatePermissionsFilter(userData, {
+      prefix: config.prefix || '',
+      showMembershipRestrictedContent: config.showMembershipRestrictedContent,
+      showOnlyOwnedContent: config.showOnlyOwnedContent,
+    })
+
+    return permissionsFilter || ''
+  }
+
+  /**
+   * @param {StatusConfig} config - Status configuration
+   * @returns {Promise<string>} Filter expression for status
+   * @example await Filters.status({ statuses: ['published', 'scheduled'] })
+   */
+  static async status(config: StatusConfig = {}): Promise<string> {
+    if (config.bypassStatuses) return ''
+
+    let statuses = config.statuses || []
+
+    // Auto-determine statuses if not provided
+    if (statuses.length === 0) {
+      const userData = await getPermissionsAdapter().fetchUserPermissions()
+      const isAdmin = getPermissionsAdapter().isAdmin(userData)
+
+      if (config.isAdmin || isAdmin) {
+        statuses = [
+          STATUS_DRAFT,
+          STATUS_SCHEDULED,
+          STATUS_PUBLISHED,
+          STATUS_ARCHIVED,
+          STATUS_UNLISTED,
+        ]
+      } else if (config.isSingle) {
+        statuses = [STATUS_SCHEDULED, STATUS_PUBLISHED, STATUS_UNLISTED, STATUS_ARCHIVED]
+      } else {
+        statuses = [STATUS_SCHEDULED, STATUS_PUBLISHED]
+      }
+    }
+
+    const filter = Filters.statusIn(statuses)
+    return config.prefix ? applyPrefix(config.prefix, filter) : filter
+  }
+
+  /**
+   * @param {DateConfig} config - Date configuration
+   * @returns {string} Filter expression for published date
+   * @example Filters.publishedDate({ pullFutureContent: false })
+   */
+  static publishedDate(config: DateConfig = {}): string {
+    if (config.bypassPublishedDate) return ''
+
+    const now = getRoundedTime().toISOString()
+
+    let filter = ''
+    if (config.getFutureContentOnly) {
+      filter = Filters.publishedAfter(now)
+    } else if (!config.pullFutureContent) {
+      filter = Filters.publishedBefore(now)
+    }
+
+    return config.prefix && filter ? applyPrefix(config.prefix, filter) : filter
+  }
+
+  // ============================================
+  // HIGH-LEVEL COMPOSITE FILTERS
+  // ============================================
+
+  /**
+   * @param {ContentFilterConfig} config - Complete filter configuration
+   * @returns {Promise<string>} Combined filter expression (status + permissions + date + deprecated)
+   * @example await Filters.contentFilter({ bypassPermissions: false, pullFutureContent: false })
+   */
+  static async contentFilter(config: ContentFilterConfig = {}): Promise<string> {
+    return Filters.combineAsync(
+      Filters.status(config),
+      Filters.permissions({ ...config }),
+      Filters.publishedDate(config),
+      Filters.notDeprecated(config.prefix || '')
+    )
+  }
+
+  /**
+   * @param {ContentFilterConfig} config - Complete filter configuration
+   * @returns {Promise<string>} Content filter with child prefix (@->)
+   * @example await Filters.childFilter({ showMembershipRestrictedContent: true })
+   */
+  static async childFilter(config: ContentFilterConfig = {}): Promise<string> {
+    return Filters.contentFilter({ ...config, prefix: CHILD_PREFIX })
+  }
+
+  /**
+   * @param {ContentFilterConfig} config - Complete filter configuration
+   * @returns {Promise<string>} Content filter with parent prefix (^.)
+   * @example await Filters.parentFilter({ bypassPermissions: true })
+   */
+  static async parentFilter(config: ContentFilterConfig = {}): Promise<string> {
+    return Filters.contentFilter({ ...config, prefix: PARENT_PREFIX })
+  }
+
+  // ============================================
+  // MISC UTILITIES FIlTERS
+  // ============================================
+  static includedFields(includedFields: string[]): string {
+    return includedFields.length > 0 ? filtersToGroq(includedFields) : Filters.empty
+  }
+
+  static count(filter: string): string {
+    return `count(*[${filter}])`
+  }
+
+  static progressIds(progressIds: number[]): string {
+    return progressIds.length > 0 ? Filters.idIn(progressIds) : Filters.empty
+  }
+}
+
+// Default export
+export default Filters

package/src/lib/sanity/query.ts

@@ -20,7 +20,7 @@ export interface QueryBuilder {
   and(expr: string): QueryBuilder
   or(...exprs: string[]): QueryBuilder
   order(expr: string): QueryBuilder
-  slice(start: number, end: number): QueryBuilder
+  slice(offset: number, limit?: number): QueryBuilder
   first(): QueryBuilder
   select(...fields: string[]): QueryBuilder
   postFilter(expr: string): QueryBuilder
@@ -54,6 +54,8 @@ const project: Monoid<string> = {
   concat: (a, b) => (!a ? b : !b ? a : `${a}, ${b}`),
 }
 
+export const filterOps = { and, or }
+
 export const query = (): QueryBuilder => {
   let state: QueryBuilderState = {
     filter: and.empty,
@@ -83,8 +85,8 @@ export const query = (): QueryBuilder => {
     },
 
     // pagination / slicing
-    slice(start: number = 0, end?: number) {
-      const sliceExpr = !end ? `[${start}]` : `[${start}...${end}]`
+    slice(offset: number = 0, limit?: number) {
+      const sliceExpr = !limit ? `[${offset}]` : `[${offset}...${offset + limit}]`
 
       state.slice = slice.concat(state.slice, sliceExpr)
       return builder

package/src/services/content/artist.ts

@@ -1,12 +1,12 @@
 /**
  * @module Artist
  */
-import { filtersToGroq, getFieldsForContentType } from '../../contentTypeConfig.js'
-import { FilterBuilder } from '../../filterBuilder.js'
+import { getFieldsForContentType } from '../../contentTypeConfig.js'
 import { BuildQueryOptions, query } from '../../lib/sanity/query'
 import { fetchSanity, getSortOrder } from '../sanity.js'
 import { Lesson } from './content'
 import { Brands } from '../../lib/brands'
+import { Filters as f } from '../../lib/sanity/filter'
 
 export interface Artist {
   slug: string
@@ -35,27 +35,28 @@ export async function fetchArtists(
   brand: Brands | string,
   options: BuildQueryOptions = { sort: 'lower(name) asc' }
 ): Promise<Artists> {
-  const lessonFilter = await new FilterBuilder(`brand == "${brand}" && references(^._id)`, {
-    bypassPermissions: true,
-  }).buildFilter()
+  const lessonFilter = f.combine(f.brand(brand), f.referencesParent())
+  const type = f.type('artist')
+  const lessonCount = `count(*[${lessonFilter}])`
+  const postFilter = `lessonCount > 0`
 
   const data = query()
-    .and(`_type == "artist"`)
+    .and(type)
     .order(options?.sort || 'lower(name) asc')
-    .slice(options?.offset || 0, (options?.offset || 0) + (options?.limit || 20))
+    .slice(options?.offset || 0, options?.limit || 20)
     .select(
       'name',
       `"slug": slug.current`,
       `"thumbnail": thumbnail_url.asset->url`,
-      `"lessonCount": count(*[${lessonFilter}])`
+      `"lessonCount": ${lessonCount}`
     )
-    .postFilter(`lessonCount > 0`)
+    .postFilter(postFilter)
     .build()
 
   const total = query()
-    .and(`_type == "artist"`)
-    .select(`"lessonCount": count(*[${lessonFilter}])`)
-    .postFilter(`lessonCount > 0`)
+    .and(type)
+    .select(`"lessonCount": ${lessonCount}`)
+    .postFilter(postFilter)
     .build()
 
   const q = `{
@@ -82,14 +83,11 @@ export async function fetchArtistBySlug(
   slug: string,
   brand?: Brands | string
 ): Promise<Artist | null> {
-  const brandFilter = brand ? `brand == "${brand}" && ` : ''
-  const filter = await new FilterBuilder(`${brandFilter} _type == "song" && references(^._id)`, {
-    bypassPermissions: true,
-  }).buildFilter()
+  const filter = f.combine(brand ? f.brand(brand) : f.empty, f.referencesParent())
 
   const q = query()
-    .and(`_type == "artist"`)
-    .and(`slug.current == '${slug}'`)
+    .and(f.type('artist'))
+    .and(f.slug(slug))
     .select(
       'name',
       `"slug": slug.current`,
@@ -145,25 +143,25 @@ export async function fetchArtistLessons(
     progressIds = [],
   }: ArtistLessonOptions = {}
 ): Promise<ArtistLessons> {
-  const fieldsString = getFieldsForContentType(contentType) as string
-  const searchFilter = searchTerm ? `&& title match "${searchTerm}*"` : ''
-  const includedFieldsFilter = includedFields.length > 0 ? filtersToGroq(includedFields) : ''
-  const addType = contentType ? `_type == '${contentType}' && ` : ''
-  const progressFilter =
-    progressIds.length > 0 ? `&& railcontent_id in [${progressIds.join(',')}]` : ''
-  const filter = `${addType} brand == '${brand}' ${searchFilter} ${includedFieldsFilter} && references(*[_type=='artist' && slug.current == '${slug}']._id) ${progressFilter}`
-  const filterWithRestrictions = await new FilterBuilder(filter).buildFilter()
-
   sort = getSortOrder(sort, brand)
 
+  const restrictions = await f.combineAsync(
+    f.contentFilter(),
+    f.referencesIDWithFilter(f.combine(f.type('artist'), f.slug(slug)))
+  )
+
   const data = query()
-    .and(filterWithRestrictions)
+    .and(f.brand(brand))
+    .and(f.searchMatch('title', searchTerm))
+    .and(f.includedFields(includedFields))
+    .and(f.progressIds(progressIds))
+    .and(restrictions)
     .order(sort)
-    .slice(offset, offset + limit)
-    .select(...(fieldsString ? [fieldsString] : []))
+    .slice(offset, limit)
+    .select(getFieldsForContentType(contentType) as string)
     .build()
 
-  const total = query().and(filterWithRestrictions).build()
+  const total = query().and(restrictions).build()
 
   const q = `{
     "data": ${data},