musora-content-services 2.151.1 → 2.153.0

package/.github/workflows/automated-testing.yml

@@ -0,0 +1,20 @@
+name: Automated Testing
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+  push:
+    branches: [main]
+jobs:
+  unit-tests:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: npm
+      - name: Install dependencies
+        run: npm ci
+      - name: Run unit tests
+        run: npm test

package/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 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.153.0](https://github.com/railroadmedia/musora-content-services/compare/v2.152.1...v2.153.0) (2026-04-15)
+
+
+### Features
+
+* 15 minutes ([#911](https://github.com/railroadmedia/musora-content-services/issues/911)) ([87594f8](https://github.com/railroadmedia/musora-content-services/commit/87594f8d33a90452df66d55e7c00d9b0eb15b30b))
+* initial not bad melon test slop ([#918](https://github.com/railroadmedia/musora-content-services/issues/918)) ([008052b](https://github.com/railroadmedia/musora-content-services/commit/008052bbce724ae49fc12734e28957846be76ab3))
+
+
+### Bug Fixes
+
+* loki adapter cjs/esm export issues in mcs-cli ([#920](https://github.com/railroadmedia/musora-content-services/issues/920)) ([480755e](https://github.com/railroadmedia/musora-content-services/commit/480755e816e28540cd123efd24ae7e299baecabe))
+* remove flush session interval ([#867](https://github.com/railroadmedia/musora-content-services/issues/867)) ([67af03b](https://github.com/railroadmedia/musora-content-services/commit/67af03b5a0d8159d7754e86d94fa736ac47beab0))
+* unref timer only in node ([92385d6](https://github.com/railroadmedia/musora-content-services/commit/92385d66659b76f1f41ebbfba3557aaea14f1abd))
+
+### [2.152.1](https://github.com/railroadmedia/musora-content-services/compare/v2.152.0...v2.152.1) (2026-04-09)
+
+## [2.152.0](https://github.com/railroadmedia/musora-content-services/compare/v2.151.1...v2.152.0) (2026-04-09)
+
+
+### Features
+
+* use sanity.musora.com cloudflare worker for caching ([#900](https://github.com/railroadmedia/musora-content-services/issues/900)) ([a6302f9](https://github.com/railroadmedia/musora-content-services/commit/a6302f96374fdea152f9fddd3ce8a8512e1c7b17))
+
 ### [2.151.1](https://github.com/railroadmedia/musora-content-services/compare/v2.151.0...v2.151.1) (2026-04-08)
 
 

package/jest.config.js

@@ -17,6 +17,8 @@ export default {
   // Automatically clear mock calls, instances, contexts and results before every test
   clearMocks: true,
 
+  testTimeout: 30000,
+
   // Indicates whether the coverage information should be collected while executing the test
   collectCoverage: true,
 
@@ -92,7 +94,10 @@ export default {
   // moduleNameMapper: {},
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
-  modulePathIgnorePatterns: ['<rootDir>/test/live'],
+  modulePathIgnorePatterns: [
+    '<rootDir>/test/live',
+    '<rootDir>/test/integration'
+  ],
 
   // Activates notifications for test results
   // notify: false,
@@ -136,7 +141,11 @@ export default {
   // setupFiles: [],
 
   // A list of paths to modules that run some code to configure or set up the testing framework before each test
-  setupFilesAfterEnv: ['dotenv/config'],
+  setupFilesAfterEnv: [
+    'dotenv/config',
+    '<rootDir>/test/setupConsole.js',
+    '<rootDir>/test/setupNetworkGuard.js'
+  ],
 
   // The number of seconds after which a test is considered as slow and reported as such in the results.
   // slowTestThreshold: 5,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "2.151.1",
+  "version": "2.153.0",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "type": "module",
@@ -26,10 +26,14 @@
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.27.1",
     "@sentry/browser": "^10.21.0",
+    "@types/better-sqlite3": "^7.6.13",
     "@types/jest": "^30.0.0",
     "babel-jest": "^29.7.0",
+    "better-sqlite3": "^12.9.0",
     "dotenv": "^16.4.5",
+    "fake-indexeddb": "^6.2.5",
     "jest": "^29.7.0",
+    "jest-environment-jsdom": "^30.3.0",
     "jsdoc": "^4.0.3",
     "jsdoc-babel": "^0.5.0",
     "prettier": "3.4.2",

package/src/contentTypeConfig.js

@@ -8,6 +8,9 @@ export const CloudFrontURl = 'https://d3fzm1tzeyr5n3.cloudfront.net'
 
 // This is used to pull related content by license, so we only show "consumable" content
 export const SONG_TYPES = ['song', 'play-along', 'jam-track', 'song-tutorial-lesson']
+
+export const parentReferenceField = 'parent_content_reference[0]'
+export const grandParentReferenceField = 'parent_content_reference[1]'
 // Oct 2025: It turns out content-meta categories are not really clear
 // THis is used for the page_type field as a post processor so we include parents and children
 // Duplicated in SanityGateway.php if you update this, update that
@@ -23,10 +26,6 @@ export const SINGLE_PARENT_TYPES = ['course-lesson', 'pack-bundle-lesson', 'song
 
 export const LEARNING_PATH_LESSON = 'learning-path-lesson-v2'
 
-export const parentField = 'parent_content_data[0]'
-
-export const grandParentField = 'parent_content_data[1]'
-
 export const genreField = `genre[]->{
   name,
   'slug': slug.current,
@@ -45,7 +44,7 @@ export const instructorField = `instructor[]->{
 
 export const artistField = `select(
           defined(artist) => artist->{ 'name': name, 'slug': slug.current, 'thumbnail': thumbnail_url.asset->url},
-          defined(parent_content_data) => *[_type == ^.parent_content_data[0].type && railcontent_id == ^.parent_content_data[0].id][0].artist->{ 'name': name, 'slug': slug.current, 'thumbnail': thumbnail_url.asset->url}
+          defined(parent_content_reference) => ${parentReferenceField}->artist->{ 'name': name, 'slug': slug.current, 'thumbnail': thumbnail_url.asset->url}
         )`
 
 export const DEFAULT_FIELDS = [
@@ -68,8 +67,8 @@ export const DEFAULT_FIELDS = [
   "'slug' : slug.current",
   "'permission_id': permission_v2",
   'child_count',
-  '"parent_id": parent_content_data[0].id',
-  '"grandparent_id": parent_content_data[1].id',
+  `"parent_id": ${parentReferenceField}->railcontent_id`,
+  `"grandparent_id": ${grandParentReferenceField}->railcontent_id`,
   'live_event_start_time',
   'live_event_end_time',
   'enrollment_start_time',
@@ -96,8 +95,8 @@ export const DEFAULT_CHILD_FIELDS = [
   "'slug' : slug.current",
   "'permission_id': permission_v2",
   'child_count',
-  '"parent_id": parent_content_data[0].id',
-  '"grandparent_id": parent_content_data[1].id',
+  `"parent_id": ${parentReferenceField}->railcontent_id`,
+  `"grandparent_id": ${grandParentReferenceField}->railcontent_id`,
 ]
 
 export const playAlongMp3sField = `{
@@ -118,7 +117,7 @@ export const descriptionField = 'description[0].children[0].text'
 // this pulls both any defined resources for the document as well as any resources in the parent document
 export const resourcesField = `[
           ... resource[]{resource_name, _key, "resource_url": coalesce('${CloudFrontURl}'+string::split(resource_aws.asset->fileURL, '${AWSUrl}')[1], resource_url )},
-          ... *[defined(resource) && railcontent_id in [...(^.parent_content_data[].id)]].resource[]{resource_name, _key, "resource_url": coalesce('${CloudFrontURl}'+string::split(resource_aws.asset->fileURL, '${AWSUrl}')[1], resource_url )},
+          ... coalesce(parent_content_reference[]->resource[]{resource_name, _key, "resource_url": coalesce('${CloudFrontURl}'+string::split(resource_aws.asset->fileURL, '${AWSUrl}')[1], resource_url )}, []),
           ]`
 
 export const contentAwardField = "*[references(^._id) && _type == 'content-award'][0]"
@@ -405,7 +404,7 @@ export let contentTypeConfig = {
   },
   'progress-tracker': {
     fields: [
-      '"parent_content_data": parent_content_data[].id',
+      '"parent_content_data": parent_content_reference[]->railcontent_id',
       `"badge" : ${contentAwardField}.badge.asset->url`,
       `"badge_rear" : ${contentAwardField}.badge_rear.asset->url`,
       `"badge_logo" : ${contentAwardField}.logo.asset->url`,
@@ -528,9 +527,9 @@ export let contentTypeConfig = {
     ],
     includeChildFields: true,
     childFields: [
-      `"parent_data": parent_content_data[0] {
-        "id": id,
-        "title": *[railcontent_id == ^.id][0].title,
+      `"parent_data": ${parentReferenceField}->{
+        "id": railcontent_id,
+        title,
     }`,
     ],
   },

package/src/infrastructure/http/interfaces/RequestOptions.ts

@@ -2,6 +2,6 @@ export interface RequestOptions {
   method: string
   headers: Record<string, string>
   credentials?:  "omit" | "same-origin" | "include"
-  body?: string
+  body?: string | FormData
   cache?: RequestCache
 }

package/src/services/awards/internal/award-definitions.js

@@ -6,6 +6,8 @@
 /**  @typedef {Map} AwardDefinitionsMap */
 /**  @typedef {Map} ContentToAwardsMap */
 
+import { globalConfig } from '../../config'
+
 const STORAGE_KEY = 'musora_award_definitions_last_fetch'
 
 class AwardDefinitionsService {
@@ -173,7 +175,6 @@ class AwardDefinitionsService {
 
   async loadLastFetchFromStorage() {
     try {
-      const { globalConfig } = await import('../../config')
       if (!globalConfig.localStorage) {
         return
       }
@@ -194,8 +195,7 @@ class AwardDefinitionsService {
 
   async saveLastFetchToStorage() {
     try {
-      const { globalConfig } = await import('../../config')
-      if (!globalConfig.localStorage) {
+      if (!globalConfig?.localStorage) {
         return
       }
 

package/src/services/content-org/guided-courses.ts

@@ -1,7 +1,7 @@
 /**
  * @module GuidedCourses
  */
-import { GET, POST } from '../../infrastructure/http/HttpClient.ts'
+import { GET, POST } from '../../infrastructure/http/HttpClient'
 import { contentStatusStarted, getProgressState } from '../contentProgress.js'
 import './playlists-types.js'
 

package/src/services/contentProgress.js

@@ -416,7 +416,6 @@ export async function recordWatchSession(
   mediaLengthSeconds,
   currentSeconds,
   secondsPlayed,
-  prevSession = null,
   instrumentId = null,
   categoryId = null,
   isLivestream = false,
@@ -424,32 +423,14 @@ export async function recordWatchSession(
   contentId = normalizeContentId(contentId)
   collection = normalizeCollection(collection)
 
-  if (!prevSession) {
-    prevSession = {
-      pushInterval: null
-    }
-  }
-
   // Track practice and progress locally (no immediate push)
   await Promise.all([
     trackPractice(contentId, secondsPlayed, { instrumentId, categoryId }),
     trackProgress(contentId, collection, currentSeconds, mediaLengthSeconds, isLivestream),
   ])
-
-  if (!prevSession.pushInterval) {
-    prevSession.pushInterval = setInterval(() => {
-      flushWatchSession()
-    }, PUSH_INTERVAL)
-  }
-  return prevSession
 }
 
-export async function flushWatchSession(sessionToFlush = null, shouldClearInterval = true) {
-  if (shouldClearInterval && sessionToFlush?.pushInterval) {
-    clearInterval(sessionToFlush.pushInterval)
-    sessionToFlush.pushInterval = null
-  }
-
+export async function flushWatchSession() {
   db.contentProgress.requestPushUnsynced('flush-watch-session')
   db.practices.requestPushUnsynced('flush-watch-session')
 }

package/src/services/dateUtils.js

@@ -31,9 +31,17 @@ export function getMonday(date, timeZone = Intl.DateTimeFormat().resolvedOptions
 export function getWeekNumber(date) {
   return dayjs(date).isoWeek()
 }
+
+// Decides if we need to convert or interpret the date based on whether it has timezone info.
+export function toLocalDay(date, timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone) {
+  const hasTimezoneInfo = /Z$|[+-]\d{2}:?\d{2}$/.test(String(date))
+  // Has timezone info ? convert : interpret
+  return hasTimezoneInfo ? dayjs(date).tz(timeZone) : dayjs.tz(date, timeZone)
+}
+
 //Check if two dates are the same
 export function isSameDate(date1, date2) {
-  return dayjs(date1).isSame(dayjs(date2), 'day')
+  return toLocalDay(date1).isSame(toLocalDay(date2), 'day')
 }
 
 // Check if two dates are consecutive days

package/src/services/forums/posts.ts

@@ -23,7 +23,7 @@ export interface CreatePostParams {
  * @throws {HttpError} - If the request fails.
  */
 export async function createPost(threadId: number, params: CreatePostParams): Promise<ForumPost> {
-  const { generateForumPostUrl } = await import('../urlBuilder.ts')
+  const { generateForumPostUrl } = await import('../urlBuilder')
 
   // Generate forum post URL
   const contentUrl = generateForumPostUrl({
@@ -114,7 +114,7 @@ export async function fetchPosts(
  * @throws {HttpError} - If the request fails.
  */
 export async function likePost(postId: number, brand: string): Promise<void> {
-  const { generateForumPostUrl } = await import('../urlBuilder.ts')
+  const { generateForumPostUrl } = await import('../urlBuilder')
 
   // Generate forum post URL
   const contentUrl = generateForumPostUrl({

package/src/services/recommendations.js

@@ -32,16 +32,6 @@ export async function fetchSimilarItems(content_id, brand, count = 10) {
   if (!content_id) {
     return []
   }
-  if (brand === 'playbass') {
-    // V2 launch customization for playbass
-    const content = (await fetchByRailContentIds([content_id], 'tab-data'))[0] ?? []
-    if (!content) {
-      return []
-    }
-    const section = content.page_type === 'song' ? 'song' : ''
-    const recs = await recommendations('playbass', {section: section})
-    return recs.slice(0, count)
-  } else {
     content_id = parseInt(content_id)
     const data = {
       brand: brand,
@@ -56,8 +46,6 @@ export async function fetchSimilarItems(content_id, brand, count = 10) {
       console.error('Fetch error:', error)
       return null
     }
-  }
-
 }
 
 /**
@@ -79,27 +67,25 @@ export async function rankCategories(brand, categories) {
   if (categories.length === 0) {
     return []
   }
-  if (brand !== 'playbass') {
-    const data = {
-      brand: brand,
-      user_id: globalConfig.sessionConfig.userId,
-      playlists: categories,
-    }
-    const url = `/rank_each_list/`
-    try {
-      const response = await recommenderClient.post(url, data)
-      const rankedCategories = []
+  const data = {
+    brand: brand,
+    user_id: globalConfig.sessionConfig.userId,
+    playlists: categories,
+  }
+  const url = `/rank_each_list/`
+  try {
+    const response = await recommenderClient.post(url, data)
+    const rankedCategories = []
 
-      for (const rankedPlaylist of response['ranked_playlists']) {
-        rankedCategories.push({
-          slug: rankedPlaylist.playlist_id,
-          items: rankedPlaylist.ranked_items,
-        })
-      }
-      return rankedCategories
-    } catch (error) {
-      console.error('RankCategories fetch error:', error)
+    for (const rankedPlaylist of response['ranked_playlists']) {
+      rankedCategories.push({
+        slug: rankedPlaylist.playlist_id,
+        items: rankedPlaylist.ranked_items,
+      })
     }
+    return rankedCategories
+  } catch (error) {
+    console.error('RankCategories fetch error:', error)
   }
 
   const defaultSorting = []
@@ -127,9 +113,6 @@ export async function rankItems(brand, content_ids) {
   if (content_ids.length === 0) {
     return []
   }
-  if (brand === 'playbass') {
-    return content_ids
-  }
   const data = {
     brand: brand,
     user_id: globalConfig.sessionConfig.userId,

package/src/services/reporting/reporting.ts

@@ -11,9 +11,8 @@ import { HttpClient } from '../../infrastructure/http/HttpClient'
 import { globalConfig } from '../config.js'
 import { ReportResponse, ReportableType, IssueTypeMap, ReportIssueOption } from './types'
 import { Brands } from '../../lib/brands'
-import { generateContentUrl, generatePlaylistUrl, generateForumPostUrl, generateCommentUrl } from '../urlBuilder.ts'
-import {fetchByRailContentId} from "../../index";
-import {fetchByRailContentIds} from "../sanity";
+import { generateContentUrl, generatePlaylistUrl, generateForumPostUrl, generateCommentUrl } from '../urlBuilder'
+import {fetchByRailContentId, fetchByRailContentIds} from "../sanity";
 import {addContextToContent} from "../contentAggregator";
 
 /**
@@ -122,7 +121,7 @@ export async function report<T extends ReportableType>(
       id: params.id
     })
   } else if (params.type === 'forum_post') {
-    const { fetchPost } = await import('../forums/posts.ts')
+    const { fetchPost } = await import('../forums/posts')
     const post = await fetchPost(params.id, params.brand)
 
     if (post?.thread) {

package/src/services/sanity.js

@@ -33,8 +33,9 @@ import {
   SONG_TYPES_WITH_CHILDREN,
   liveFields,
   postProcessBadge,
-  parentField,
-  grandParentField, parentRecentTypes,
+  parentRecentTypes,
+  parentReferenceField,
+  grandParentReferenceField,
 } from '../contentTypeConfig.js'
 import { fetchSimilarItems } from './recommendations.js'
 import { getSongType, processMetadata, ALWAYS_VISIBLE_TABS, CONTENT_STATUSES } from '../contentMetaData.js'
@@ -952,7 +953,7 @@ export async function fetchLessonContent(railContentId, { addParent = false } =
   }
 
   const parentQuery = addParent
-    ? `"parent_content_data": *[railcontent_id in [...(^.parent_content_data[].id)]]{
+    ? `"parent_content_data": parent_content_reference[]->{
         "id": railcontent_id,
         title,
         slug,
@@ -960,11 +961,12 @@ export async function fetchLessonContent(railContentId, { addParent = false } =
         "logo" : logo_image_url.asset->url,
         "dark_mode_logo": dark_mode_logo_url.asset->url,
         "light_mode_logo": light_mode_logo_url.asset->url,
-        "badge": *[references(^._id) && _type == 'content-award'][0].badge.asset->url,
-        "badge_rear": *[references(^._id) && _type == 'content-award'][0].badge_rear.asset->url,
-        "badge_logo": *[references(^._id) && _type == 'content-award'][0].logo.asset->url,
-        'parentCount': coalesce(count(parent_content_data), 0)
-      } | order(parentCount desc),`
+        ...*[references(^._id) && _type == 'content-award'][0]{
+          "badge": badge.asset->url,
+          "badge_rear": badge_rear.asset->url,
+          "badge_logo": logo.asset->url,
+        }
+      },`
     : ''
 
   const fields = `${getFieldsForContentType()}
@@ -1106,19 +1108,6 @@ async function fetchRelatedByLicense(railcontentId, brand, onlyUseSongTypes, cou
  * @returns {Promise<Array<Object>|null>} - The fetched related lessons data or null if not found.
  */
 export async function fetchSiblingContent(railContentId, brand = null) {
-  const filterGetParent = await new FilterBuilder(`references(^._id) && _type == ^.parent_type`, {
-    pullFutureContent: true,
-    showMembershipRestrictedContent: true, // Show parent even without permissions
-  }).buildFilter()
-  const filterForParentList = await new FilterBuilder(
-    `references(^._id) && _type == ^.parent_type`,
-    {
-      pullFutureContent: true,
-      isParentFilter: true,
-      showMembershipRestrictedContent: true, // Show parent even without permissions
-    }
-  ).buildFilter()
-
   const childrenFilter = await new FilterBuilder(``, {
     isChildrenFilter: true,
     showMembershipRestrictedContent: true, // Show all lessons in sidebar, need_access applied on individual page
@@ -1126,20 +1115,20 @@ export async function fetchSiblingContent(railContentId, brand = null) {
 
   const brandString = brand ? ` && brand == "${brand}"` : ''
   const queryFields = getFieldsForContentType()
-
+  const courseCollectionFields = await getFieldsForContentTypeWithFilteredChildren('course-collection')
   const query = `*[railcontent_id == ${railContentId}${brandString}]{
     _type,
     parent_type,
     railcontent_id,
-    'parent_id': ${parentField}.id,
-    'grandparent_id':${grandParentField}.id,
-    'for-calculations': *[${filterGetParent}][0]{
-    'siblings-list': child[]->railcontent_id,
-    'parents-list': *[${filterForParentList}][0].child[]->railcontent_id
+    'parent_id': ${parentReferenceField}->railcontent_id,
+    'grandparent_id': ${grandParentReferenceField}->railcontent_id,
+    'collection_data': ${grandParentReferenceField}->{${courseCollectionFields}},
+    'for-calculations': ${parentReferenceField}->{
+      'siblings-list': child[]->railcontent_id,
+      'parents-list': ${parentReferenceField}->child[]->railcontent_id
     },
-    "related_lessons" : *[${filterGetParent}][0].child[${childrenFilter}]->{${queryFields}}
+    "related_lessons" : ${parentReferenceField}->child[${childrenFilter}]->{${queryFields}}
   }`
-
   let result = await fetchSanity(query, false, { processNeedAccess: true })
 
   //there's no way in sanity to retrieve the index of an array, so we must calculate after fetch
@@ -1152,10 +1141,6 @@ export async function fetchSiblingContent(railContentId, brand = null) {
 
     delete result['for-calculations']
 
-    if (result['grandparent_id']) {
-      result['collection_data'] = await fetchCourseCollectionData(result['grandparent_id'])
-    }
-
     result = { ...result, parentCount, currentParentIndex, siblingCount, currentSiblingIndex }
     return result
   } else {
@@ -1199,7 +1184,7 @@ export async function fetchRelatedLessons(railContentId) {
 }
 
 export async function fetchLiveEvent(brand, forcedContentId = null) {
-  const LIVE_EXTRA_MINUTES = 30
+  const LIVE_EXTRA_MINUTES = 15
   //calendarIDs taken from addevent.php
   // TODO import instructor calendars to Sanity
   let defaultCalendarID = ''
@@ -1320,16 +1305,12 @@ export async function fetchByReference(
  * @returns {Promise<int|null>}
  */
 export async function fetchTopLevelParentId(railcontentId) {
-  const parentFilter = 'railcontent_id in [...(^.parent_content_data[].id)] && (!defined(parent_content_data) || count(parent_content_data) == 0)'
-  const statusFilter = "&& status in ['scheduled', 'published', 'archived', 'unlisted']"
-
   const query = `*[railcontent_id == ${railcontentId}]{
-      railcontent_id,
-      'top_parent': *[${parentFilter} ${statusFilter}][0].railcontent_id
+      'top_parent': coalesce(${grandParentReferenceField}->railcontent_id, ${parentReferenceField}->railcontent_id, railcontent_id),
     }`
   let response = await fetchSanity(query, false, { processNeedAccess: false })
   if (!response) return null
-  return response['top_parent'] ?? response['railcontent_id']
+  return response['top_parent'] ?? railcontentId
 }
 
 export async function getHierarchy(contentId, collection) {
@@ -1403,31 +1384,18 @@ async function fetchALaCarteHierarchyData(railcontentId) {
   const childrenFilter = await new FilterBuilder(``, { isChildrenFilter: true }).buildFilter()
   const query = `*[railcontent_id == ${topLevelId}]{
       railcontent_id,
-      'metadata': { brand, 'type': _type, 'parent_id':  coalesce(parent_content_data[0].id, 0) },
+      'metadata': { brand, 'type': _type, 'parent_id':  coalesce(${parentReferenceField}->railcontent_id, 0) },
       'assignments': assignment[]{railcontent_id},
       'children': child[${childrenFilter}]->{
         railcontent_id,
-        'metadata': {
-  brand, 'type': _type, 'parent_id':  coalesce(parent_content_data[0].id, 0) },
+        'metadata': { brand, 'type': _type, 'parent_id':  coalesce(${parentReferenceField}->railcontent_id, 0) },
         'assignments': assignment[]{railcontent_id},
         'children': child[${childrenFilter}]->{
             railcontent_id,
-            'metadata': {
-      brand, 'type': _type, 'parent_id':  coalesce(parent_content_data[0].id, 0) },
+            'metadata': { brand, 'type': _type, 'parent_id':  coalesce(${parentReferenceField}->railcontent_id, 0) },
             'assignments': assignment[]{railcontent_id},
-            'children': child[${childrenFilter}]->{
-               railcontent_id,
-               'metadata': {
-         brand, 'type': _type, 'parent_id':  coalesce(parent_content_data[0].id, 0) },
-               'assignments': assignment[]{railcontent_id},
-               'children': child[${childrenFilter}]->{
-                  railcontent_id,
-                  'metadata': {
-            brand, 'type': _type, 'parent_id':  coalesce(parent_content_data[0].id, 0) },
-            }
-          }
         }
-      },
+      }
     }`
   return await fetchSanity(query, false, { processNeedAccess: false })
 }
@@ -1517,7 +1485,7 @@ export async function fetchSanity(
   }
   const perspective = globalConfig.sanityConfig.perspective ?? 'published'
   const api = globalConfig.sanityConfig.useCachedAPI ? 'apicdn' : 'api'
-  const baseUrl = `https://${globalConfig.sanityConfig.projectId}.${api}.sanity.io/v${globalConfig.sanityConfig.version}/data/query/${globalConfig.sanityConfig.dataset}?perspective=${perspective}`
+  const baseUrl = `https://sanity.musora.com/${globalConfig.sanityConfig.projectId}/${api}/v${globalConfig.sanityConfig.version}/${globalConfig.sanityConfig.dataset}?perspective=${perspective}`
 
   try {
     const encodedQuery = encodeURIComponent(query)
@@ -2000,7 +1968,7 @@ export async function fetchTabData(
     ? `&& !(railcontent_id in [${excludeIds.join(',')}])`
     : ''
 
-  const excludeCoursesInCourseCollectionsFilter = `&& !(_type == 'course' && defined(parent_content_data))`
+  const excludeCoursesInCourseCollectionsFilter = `&& !(_type == 'course' && defined(parent_content_reference) && count(parent_content_reference[]) > 0)`
 
   filter = `brand == "${brand}" && (defined(railcontent_id)) ${includedFieldsFilter} ${progressFilter} ${excludedIdsFilter} ${excludeCoursesInCourseCollectionsFilter}`
   const childrenFilter = await new FilterBuilder(``, {

package/src/services/sync/adapters/lokijs.ts

@@ -1,14 +1,17 @@
 import { SyncTelemetry } from '../telemetry'
 
-import LokiJSAdapter from '@nozbe/watermelondb/adapters/lokijs'
+import _LokiJSAdapter from '@nozbe/watermelondb/adapters/lokijs'
 
 import { deleteDatabase, lokiFatalError } from '@nozbe/watermelondb/adapters/lokijs/worker/lokiExtensions'
 
+// Handle CJS/ESM interop: in Node.js ESM the default import is the exports object
+const LokiJSAdapter = (_LokiJSAdapter as any).default ?? _LokiJSAdapter
+
 export type LokiExtensions = {
   onPersistenceError?: (err: Error) => void
 }
 
-export default class LokiPersistenceErrorAwareAdapter extends LokiJSAdapter {
+export default class LokiPersistenceErrorAwareAdapter extends (LokiJSAdapter as typeof _LokiJSAdapter) {
   constructor(options: any, extensions: LokiExtensions = {}) {
     super(options);
     const that = this;

package/src/services/sync/fetch.ts

@@ -122,7 +122,7 @@ export interface SyncResponseBase {
 
 export type PushPayload = {
   entries: ({
-    record: BaseModel
+    record: Record<string, unknown>
     meta: {
       ids: {
         id: string
@@ -135,23 +135,11 @@ export type PushPayload = {
       ids: {
         id: string
       }
-      deleted_at: EpochMs
+      deleted_at: number
     }
   })[]
 }
 
-interface ServerPushPayload {
-  entries: {
-    record: BaseModel | null
-    meta: {
-      ids: {
-        id: string
-      },
-      deleted_at: EpochMs | null
-    }
-  }[]
-}
-
 export function makeFetchRequest(input: RequestInfo, init?: RequestInit) {
   return (userId: number, context: SyncContext) => new Request(globalConfig.baseUrl + input, {
     ...init,