musora-content-services 1.0.32 → 1.0.33

package/babel.config.js

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

package/jest.config.js

@@ -101,7 +101,7 @@ const config = {
   // notifyMode: "failure-change",
 
   // A preset that is used as a base for Jest's configuration
-  // preset: undefined,
+    preset: 'ts-jest',
 
   // Run tests from one or more projects
   // projects: undefined,
@@ -174,8 +174,11 @@ const config = {
   // testRunner: "jest-circus/runner",
 
   // A map from regular expressions to paths to transformers
-  // transform: undefined,
 
+    transform: {
+        '^.+\\.(ts|tsx)?$': 'ts-jest',
+        '^.+\\.(js|jsx)$': 'babel-jest',
+    }
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
   // transformIgnorePatterns: [
   //   "/node_modules/",
@@ -193,6 +196,8 @@ const config = {
 
   // Whether to use watchman for file crawling
   // watchman: true,
+
 };
 
 module.exports = config;
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "1.0.32",
+  "version": "1.0.33",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "scripts": {
@@ -25,6 +25,9 @@
     "standard-version": "^9.5.0"
   },
   "dependencies": {
-    "docdash": "^2.0.2"
+    "@babel/preset-env": "^7.25.3",
+    "babel-jest": "^29.7.0",
+    "docdash": "^2.0.2",
+    "ts-jest": "^29.2.4"
   }
 }

package/src/contentTypeConfig.js

@@ -3,7 +3,7 @@ let contentTypeConfig = {
         'fields': [
             '"artist_name": artist->name',
             'soundslice',
-            'instrumentless'
+            'instrumentless',
         ],
         'relationships': {
             'artist': {

package/src/index.d.ts

@@ -1,5 +1,4 @@
 import {
-    initializeService,
     fetchSongById,
     fetchArtists,
     fetchSongArtistCount,
@@ -9,6 +8,7 @@ import {
     fetchSongCount,
     fetchWorkouts,
     fetchNewReleases,
+    fetchLiveEvent,
     fetchUpcomingEvents,
     fetchByRailContentId,
     fetchByRailContentIds,
@@ -21,7 +21,9 @@ import {
     fetchPackAll,
     fetchPackChildren,
     fetchLessonContent
-} from './index.js';
+  } from './services/sanity.js';
+  
+  import { initializeService } from './services/config.js';
 
 declare module 'musora-content-services' {
     export {

package/src/services/sanity.js

@@ -1,11 +1,10 @@
 /**
  * @module Sanity-Services
  */
+import {contentTypeConfig} from "../contentTypeConfig";
+import {globalConfig} from "./config";
 
-const { contentTypeConfig } = require('../contentTypeConfig.js');
-const { globalConfig } = require('./config');
-
-import { fetchAllCompletedStates, fetchCurrentSongComplete } from './railcontent.js'; 
+import { fetchAllCompletedStates, fetchCurrentSongComplete } from './railcontent.js';
 
 /**
 * Fetch a song by its document ID from Sanity.
@@ -20,6 +19,10 @@ import { fetchAllCompletedStates, fetchCurrentSongComplete } from './railcontent
 */
 export async function fetchSongById(documentId) {
     const fields = [
+      '"id": railcontent_id',
+      'railcontent_id',
+      '"type": _type',
+      'description',
       'title',
       '"thumbnail_url": thumbnail.asset->url',
       '"style": genre[0]->name',
@@ -28,8 +31,9 @@ export async function fetchSongById(documentId) {
       'instrumentless',
       'soundslice',
       '"resources": resource[]{resource_url, resource_name}',
+      '"url": web_url_path',
     ];
-  
+
     const query = `
         *[_type == "song" && railcontent_id == ${documentId}]{
             ${fields.join(', ')}
@@ -144,11 +148,11 @@ export async function fetchRelatedSongs(brand, songId) {
           }[0...10])
         ])[0...10]
     }`;
-  
+
     // Fetch the related songs data
     return fetchSanity(query, false);
 }
-  
+
 /**
  * Fetch all songs for a specific brand with pagination and search options.
  * @param {string} brand - The brand for which to fetch songs.
@@ -289,7 +293,7 @@ export async function fetchNewReleases(brand) {
 
 
 /**
- * Fetch upcoming events for a specific brand that are within 48 hours before their `published_on` date 
+ * Fetch upcoming events for a specific brand that are within 48 hours before their `published_on` date
  * and are currently ongoing based on their `length_in_seconds`.
  *
  * This function retrieves events that have a `published_on` date within the last 48 hours or are currently
@@ -303,7 +307,7 @@ export async function fetchNewReleases(brand) {
  * fetchLiveEvent('drumeo')
  *   .then(events => console.log(events))
  *   .catch(error => console.error(error));
- * 
+ *
  */
 export async function fetchLiveEvent(brand) {
     const baseLiveTypes = ["student-review", "student-reviews", "student-focus", "coach-stream", "live", "question-and-answer", "student-review", "boot-camps", "recording", "pack-bundle-lesson"];
@@ -511,7 +515,10 @@ export async function fetchAll(brand, type, {
           break;
   }
 
-    let defaultFields = ['railcontent_id',
+    let defaultFields = [
+        '"id": railcontent_id',
+        'railcontent_id',
+        '"type": _type',
         'title',
         '"image": thumbnail.asset->url',
         'difficulty',

package/test/sanityQueryService.test.js

@@ -1,5 +1,6 @@
+import {initializeService} from '../src/services/config.js';
+
 const {
-    initializeService,
     fetchSongById,
     fetchArtists,
     fetchSongArtistCount,
@@ -21,18 +22,18 @@ const {
     fetchPackAll,
     fetchPackChildren,
     fetchLessonContent
-} = require('../src/index.js');
+} = require('../src/services/sanity.js');
 
 describe('Sanity Queries', function () {
     beforeEach(() => {
-        const config = {
+        const config = { 'sanityConfig':{
             token: process.env.SANITY_API_TOKEN,
             projectId: process.env.SANITY_PROJECT_ID,
             dataset: process.env.SANITY_DATASET,
             useCachedAPI: process.env.SANITY_USE_CACHED_API || true,
             version: '2021-06-07',
             debug: process.env.DEBUG || false
-        };
+        }};
         initializeService(config);
     });