musora-content-services 1.0.257 → 1.1.3

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 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.
 
+### [1.1.3](https://github.com/railroadmedia/musora-content-services/compare/v1.1.2...v1.1.3) (2025-01-08)
+
+### [1.1.2](https://github.com/railroadmedia/musora-content-services/compare/v1.1.1...v1.1.2) (2025-01-08)
+
+### [1.1.1](https://github.com/railroadmedia/musora-content-services/compare/v1.1.0...v1.1.1) (2025-01-08)
+
+## [1.1.0](https://github.com/railroadmedia/musora-content-services/compare/v1.0.258...v1.1.0) (2025-01-08)
+
+
+### Features
+
+* add es6 exports ([f16d26f](https://github.com/railroadmedia/musora-content-services/commit/f16d26ffd26cc0febdb4050b5fd33bcd06c78c54))
+
+
+### Bug Fixes
+
+* babel blocking tests ([b219af7](https://github.com/railroadmedia/musora-content-services/commit/b219af7097927bd6452af533f9ec0722cbba9c29))
+* jest esm support and security vulnerability ([1aa7f91](https://github.com/railroadmedia/musora-content-services/commit/1aa7f9181247e26f91f038edefd5b3e50b276661))
+* merge conflict ([c7714b9](https://github.com/railroadmedia/musora-content-services/commit/c7714b932585ae0a862370027be57f285878033c))
+
+### [1.0.258](https://github.com/railroadmedia/musora-content-services/compare/v1.0.257...v1.0.258) (2025-01-08)
+
 ### [1.0.257](https://github.com/railroadmedia/musora-content-services/compare/v1.0.256...v1.0.257) (2025-01-03)
 
 ### [1.0.256](https://github.com/railroadmedia/musora-content-services/compare/v1.0.255...v1.0.256) (2025-01-02)

package/babel.config.cjs

@@ -0,0 +1,3 @@
+module.exports = {
+    presets: ['@babel/preset-env']
+}

package/jest.config.js

@@ -4,7 +4,7 @@
  */
 
 /** @type {import('jest').Config} */
-const config = {
+export default {
   // All imported modules in your tests should be mocked automatically
   // automock: false,
 
@@ -198,6 +198,3 @@ const config = {
   // watchman: true,
 
 };
-
-module.exports = config;
-

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "musora-content-services",
-  "version": "1.0.257",
+  "version": "1.1.3",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
+  "type": "module",
   "scripts": {
     "build-index": "node tools/generate-index.js",
     "release": "standard-version",

package/src/contentMetaData.js

@@ -1168,8 +1168,8 @@ const contentMetadata = {
     }
 };
 
-const typeWithSortOrder = ['in-rhythm', 'diy-drum-experiments', 'rhythmic-adventures-of-captain-carson'];
-function processMetadata(brand, type, withFilters = false) {
+export const typeWithSortOrder = ['in-rhythm', 'diy-drum-experiments', 'rhythmic-adventures-of-captain-carson'];
+export function processMetadata(brand, type, withFilters = false) {
     let brandMetaData = contentMetadata[brand]?.[type];
     // If the type is explicitly defined as null or the brand doesn't exist return null
     // Specifically this is for drumeo.student-review
@@ -1199,8 +1199,3 @@ function processMetadata(brand, type, withFilters = false) {
 
     return processedData;
 }
-
-module.exports = {
-    processMetadata,
-    typeWithSortOrder
-}

package/src/contentTypeConfig.js

@@ -1,4 +1,7 @@
-const DEFAULT_FIELDS = [
+//import {AWSUrl, CloudFrontURl} from "./services/config";
+export const AWSUrl = 'https://s3.us-east-1.amazonaws.com/musora-web-platform';
+export const CloudFrontURl = 'https://d3fzm1tzeyr5n3.cloudfront.net';
+export const DEFAULT_FIELDS = [
     "'sanity_id' : _id",
     "'id': railcontent_id",
     'railcontent_id',
@@ -20,13 +23,19 @@ const DEFAULT_FIELDS = [
     'status',
     "'slug' : slug.current",
     "'permission_id': permission[]->railcontent_id",
-    "xp"
+    "xp",
+    "child_count"
 ];
 
-const descriptionField = 'description[0].children[0].text';
-const resourcesField = 'resource[]{resource_name, _key, "resource_url": coalesce(\'https://d3fzm1tzeyr5n3.cloudfront.net\'+string::split(resource_aws.asset->fileURL,\'https://s3.us-east-1.amazonaws.com/musora-web-platform\')[1], resource_url )}';
+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 )},
+          ... *[railcontent_id == ^.parent_content_data[0].id] [0].resource[]{resource_name, _key, "resource_url": coalesce('${CloudFrontURl}'+string::split(resource_aws.asset->fileURL, '${AWSUrl}')[1], resource_url )},
+          ]`;
 
-const assignmentsField = `"assignments":assignment[]{
+
+export const assignmentsField = `"assignments":assignment[]{
     "id": railcontent_id,
         "soundslice_slug": assignment_soundslice,
         "title": assignment_title,
@@ -46,7 +55,7 @@ const contentWithSortField = {
         'sort',
     ]
 }
-const showsTypes = {
+export const showsTypes = {
     'drumeo': ['odd-times', 'drum-fest-international-2022', 'spotlight', 'the-history-of-electronic-drums', 'backstage-secret', 'quick-tips', 'question-and-answer', 'student-collaboration',
         'live', 'podcast', 'solo', 'boot-camp', 'gear-guide', 'performance', 'in-rhythm', 'challenges', 'on-the-road', 'diy-drum-experiment', 'rhythmic-adventures-of-captain-carson',
         'study-the-greats', 'rhythms-from-another-planet', 'tama', 'paiste-cymbals', 'behind-the-scenes', 'exploring-beats', 'sonor'
@@ -56,9 +65,9 @@ const showsTypes = {
     'singeo': ['student-review', 'question-and-answer']
 }
 
-const coachLessonsTypes = ['course', 'course-part', 'coach-stream', 'student-focus', 'quick-tips', 'pack', 'semester-pack', 'question-and-answer', 'song-tutorial', 'song-tutorial-children', 'workout'];
+export const coachLessonsTypes = ['course', 'course-part', 'coach-stream', 'student-focus', 'quick-tips', 'pack', 'semester-pack', 'question-and-answer', 'song-tutorial', 'song-tutorial-children', 'workout'];
 
-let contentTypeConfig = {
+export let contentTypeConfig = {
     'song': {
         'fields': [
             'album',
@@ -90,6 +99,11 @@ let contentTypeConfig = {
             }
         },
     },
+    'song-tutorial-children': {
+        'fields': [
+            `"resources": ${resourcesField}`,
+        ],
+    },
     'challenge': {
         'fields': [
             'enrollment_start_time',
@@ -308,6 +322,11 @@ let contentTypeConfig = {
             'total_xp',
         ]
     },
+    'pack-bundle-lesson': {
+        'fields': [
+            `"resources": ${resourcesField}`,
+        ],
+    },
     'foundation': {
         'fields': [
             `"description": ${descriptionField}`,
@@ -392,9 +411,9 @@ let contentTypeConfig = {
     'sonor': contentWithSortField,
 }
 
-const songAccessMembership = 94;
+export const songAccessMembership = 94;
 
-function getNewReleasesTypes(brand) {
+export function getNewReleasesTypes(brand) {
     const baseNewTypes = ["student-review", "student-review", "student-focus", "coach-stream", "live", "question-and-answer", "boot-camps", "quick-tips", "workout", "challenge", "challenge-part", "podcasts", "pack", "song", "learning-path-level", "play-along", "course", "unit"];
     switch (brand) {
         case 'drumeo':
@@ -408,7 +427,7 @@ function getNewReleasesTypes(brand) {
     }
 }
 
-function getUpcomingEventsTypes(brand) {
+export function getUpcomingEventsTypes(brand) {
     const baseLiveTypes = ["student-review", "student-review", "student-focus", "coach-stream", "live", "question-and-answer", "boot-camps", "quick-tips", "recording", "pack-bundle-lesson"];
     switch (brand) {
         case 'drumeo':
@@ -422,15 +441,15 @@ function getUpcomingEventsTypes(brand) {
     }
 }
 
-function artistOrInstructorName(key = 'artist_name') {
+export function artistOrInstructorName(key = 'artist_name') {
     return `'${key}': coalesce(artist->name, instructor[0]->name)`;
 }
 
-function artistOrInstructorNameAsArray(key = 'artists') {
+export function artistOrInstructorNameAsArray(key = 'artists') {
     return `'${key}': select(artist->name != null => [artist->name], instructor[]->name)`;
 }
 
-function getFieldsForContentType(contentType, asQueryString = true) {
+export function getFieldsForContentType(contentType, asQueryString = true) {
     const fields = contentType ? DEFAULT_FIELDS.concat(contentTypeConfig?.[contentType]?.fields ?? []) : DEFAULT_FIELDS;
     return asQueryString ? fields.toString() + ',' : fields;
 }
@@ -441,7 +460,7 @@ function getFieldsForContentType(contentType, asQueryString = true) {
  *     'genre,rock']
  * @returns {string} - A string that can be used in a groq query
  */
-function filtersToGroq(filters, selectedFilters = []) {
+export function filtersToGroq(filters, selectedFilters = []) {
     if (!filters) {
         filters = [];
     }
@@ -525,19 +544,3 @@ function groupFilters(filters) {
         return acc;
     }, {});
 }
-
-module.exports = {
-    contentTypeConfig,
-    descriptionField,
-    artistOrInstructorName,
-    artistOrInstructorNameAsArray,
-    getFieldsForContentType,
-    DEFAULT_FIELDS,
-    assignmentsField,
-    filtersToGroq,
-    getNewReleasesTypes,
-    getUpcomingEventsTypes,
-    showsTypes,
-    coachLessonsTypes,
-    songAccessMembership
-}

package/src/filterBuilder.js

@@ -1,7 +1,7 @@
-import {fetchUserPermissions} from "./services/userPermissions";
+import {fetchUserPermissions} from "./services/userPermissions.js";
 import {
     songAccessMembership
-} from "./contentTypeConfig";
+} from "./contentTypeConfig.js";
 
 export class FilterBuilder {
 

package/src/services/config.js

@@ -2,13 +2,13 @@
  * @module Config
  */
 
-let globalConfig = {
+export let globalConfig = {
     sanityConfig: {},
     railcontentConfig: {},
     localStorage: null,
     isMA: false,
     localTimezoneString: null, // In format: America/Vancouver
-  };
+};
 
 /**
  * Exported functions that are excluded from index generation.
@@ -60,16 +60,10 @@ const excludeFromGeneratedIndex = [];
  *   isMA: false
  * });
  */
-function initializeService(config) {
+export function initializeService(config) {
     globalConfig.sanityConfig = config.sanityConfig;
     globalConfig.railcontentConfig = config.railcontentConfig;
     globalConfig.localStorage = config.localStorage;
     globalConfig.isMA = config.isMA || false;
     globalConfig.localTimezoneString = config.localTimezoneString || null;
 }
-
-// Export both the initialization function and the config object
-module.exports = {
-    initializeService,
-    globalConfig
-};

package/src/services/contentLikes.js

@@ -1,5 +1,5 @@
-import {fetchUserLikes, postContentLiked, postContentUnliked} from "./railcontent";
-import {DataContext, ContentLikesVersionKey} from "./dataContext";
+import {fetchUserLikes, postContentLiked, postContentUnliked} from "./railcontent.js";
+import {DataContext, ContentLikesVersionKey} from "./dataContext.js";
 
 /**
  * Exported functions that are excluded from index generation.

package/src/services/contentProgress.js

@@ -3,9 +3,9 @@ import {
     postContentCompleted,
     postContentReset,
     postRecordWatchSession
-} from "./railcontent";
-import {DataContext, ContentProgressVersionKey} from "./dataContext";
-import {fetchAssignments, fetchHierarchy} from "./sanity";
+} from "./railcontent.js";
+import {DataContext, ContentProgressVersionKey} from "./dataContext.js";
+import {fetchAssignments, fetchHierarchy} from "./sanity.js";
 
 const STATE_STARTED = 'started';
 const STATE_COMPLETED = 'completed';

package/src/services/dataContext.js

@@ -1,4 +1,4 @@
-import {globalConfig} from "./config";
+import {globalConfig} from "./config.js";
 
 /**
  * Exported functions that are excluded from index generation.

package/src/services/lastUpdated.js

@@ -1,4 +1,4 @@
-import {globalConfig} from "./config";
+import {globalConfig} from "./config.js";
 
 /**
  * Exported functions that are excluded from index generation.

package/src/services/railcontent.js

@@ -1,9 +1,9 @@
 /**
  * @module Railcontent-Services
  */
-import {contentStatusCompleted} from "./contentProgress";
+import {contentStatusCompleted} from "./contentProgress.js";
 
-const {globalConfig} = require('./config');
+import { globalConfig } from "./config.js";
 
 /**
  * Exported functions that are excluded from index generation.

package/src/services/sanity.js

@@ -6,6 +6,7 @@ import {
     artistOrInstructorNameAsArray,
     assignmentsField,
     descriptionField,
+    resourcesField,
     contentTypeConfig,
     DEFAULT_FIELDS,
     getFieldsForContentType,
@@ -14,26 +15,25 @@ import {
     showsTypes,
     getNewReleasesTypes,
     coachLessonsTypes
-} from "../contentTypeConfig";
+} from "../contentTypeConfig.js";
 
 import {
     processMetadata,
     typeWithSortOrder
-} from "../contentMetaData";
+} from "../contentMetaData.js";
 
-import {globalConfig} from "./config";
+import {globalConfig} from "./config.js";
 
 import {
     fetchAllCompletedStates,
     fetchCompletedChallenges,
-    fetchCurrentSongComplete,
     fetchOwnedChallenges,
     fetchNextContentDataForParent,
     fetchHandler,
 } from './railcontent.js';
-import {arrayToStringRepresentation, FilterBuilder} from "../filterBuilder";
-import {fetchUserPermissions} from "./userPermissions";
-import {getAllCompleted, getAllStarted, getAllStartedOrCompleted} from "./contentProgress";
+import {arrayToStringRepresentation, FilterBuilder} from "../filterBuilder.js";
+import {fetchUserPermissions} from "./userPermissions.js";
+import {getAllCompleted, getAllStarted, getAllStartedOrCompleted} from "./contentProgress.js";
 
 /**
  * Exported functions that are excluded from index generation.
@@ -1179,11 +1179,7 @@ export async function fetchLessonContent(railContentId) {
     const fields = `title, 
           published_on,
           "type":_type, 
-          "resources": resource[]{resource_name, _key, 
-           "resource_url": coalesce(
-            'https://d3fzm1tzeyr5n3.cloudfront.net'+string::split(resource_aws.asset->fileURL,'https://s3.us-east-1.amazonaws.com/musora-web-platform')[1], 
-            resource_url
-          )},
+          "resources": ${resourcesField},
           difficulty, 
           difficulty_string, 
           brand, 

package/src/services/userPermissions.js

@@ -1,7 +1,7 @@
 import {
     fetchUserPermissionsData
-} from "./railcontent";
-import {setLastUpdatedTime, wasLastUpdateOlderThanXSeconds} from "./lastUpdated";
+} from "./railcontent.js";
+import {setLastUpdatedTime, wasLastUpdateOlderThanXSeconds} from "./lastUpdated.js";
 
 /**
  * Exported functions that are excluded from index generation.

package/babel.config.js

@@ -1 +0,0 @@
-module.exports = {presets: ['@babel/preset-env']}