backup

Author: iyerrama29

dist/stack.js

@@ -705,16 +705,21 @@ class Stack {
                                             references[parentUid] = references[parentUid] || [];
                                             references[parentUid] = lodash_1.uniq(references[parentUid].concat(lodash_1.map(result, 'uid')));
                                         }
-                                        const referenceBucket = [];
-                                        query.uid.$in.forEach((entityUid) => {
-                                            const elem = lodash_1.find(result, (entity) => {
-                                                return entity.uid === entityUid;
+                                        if (typeof entry[prop].values === 'string') {
+                                            entry[prop] = ((result === null) || result.length === 0) ? null : result[0];
+                                        }
+                                        else {
+                                            const referenceBucket = [];
+                                            query.uid.$in.forEach((entityUid) => {
+                                                const elem = lodash_1.find(result, (entity) => {
+                                                    return entity.uid === entityUid;
+                                                });
+                                                if (elem) {
+                                                    referenceBucket.push(elem);
+                                                }
                                             });
-                                            if (elem) {
-                                                referenceBucket.push(elem);
-                                            }
-                                        });
-                                        entry[prop] = referenceBucket;
+                                            entry[prop] = referenceBucket;
+                                        }
                                         return self.includeReferencesI(entry[prop], locale, references, parentUid)
                                             .then(rs)
                                             .catch(rj);

example/index.js

@@ -1,4 +1,4 @@
-const Contentstack = require('../dist/contentstack')
+const Contentstack = require('../dist/contentstack').Contentstack
 
 const Stack = Contentstack.Stack({
   api_key: '',
@@ -12,7 +12,7 @@ const Stack = Contentstack.Stack({
       code: 'es-es',
       relative_url_prefix: '/es/'
     }
-  ]
+  ],
 })
 
 function connect () {
@@ -31,16 +31,20 @@ function find (contentType = 'blog') {
   return new Promise((resolve, reject) => {
     Stack.contentType(contentType)
       .entries()
-      .includeCount()
+      // .includeCount()
       .includeReferences()
+      .queryReferences({'authors.category': {}})
       // .includeSchema()
-      .language('es-es')
+      // .language('es-es')
       // .notEqualTo('title', 'Blog One')
-      // .query({"title": "Blog Two"})
-      .limit(1)
+      // .query({tags: {$in: ['one', 'two']}})
+      .queryReferences({'authors.category.uid': 'c2'})
+      // .excludeReferences()
+      // .excludeAssets()
+      // .limit(1)
       // .skip(1)
       // .query({
-      //   "data.uid": 'blt17559b99fee73d6f'
+      //   uid: 'blt17559b99fee73d6f'
       // })
       .find()
       .then(resolve)

jest.config.js

@@ -99,6 +99,7 @@ module.exports = {
   // testEnvironmentOptions: {},
   testPathIgnorePatterns: [
     '/test/data/*',
+    '/test/.*config.ts'
   ],
   // The glob patterns Jest uses to detect test files
   testMatch: [

src/stack.ts

@@ -1101,17 +1101,22 @@ export class Stack {
                         references[parentUid] = references[parentUid] || []
                         references[parentUid] = uniq(references[parentUid].concat(map(result, 'uid')))
                       }
-                      // format the references in order
-                      const referenceBucket = []
-                      query.uid.$in.forEach((entityUid) => {
-                        const elem = find(result, (entity) => {
-                          return entity.uid === entityUid
+
+                      if (typeof entry[prop].values === 'string') {
+                        entry[prop] = ((result === null) || result.length === 0) ? null : result[0]
+                      } else {
+                        // format the references in order
+                        const referenceBucket = []
+                        query.uid.$in.forEach((entityUid) => {
+                          const elem = find(result, (entity) => {
+                            return entity.uid === entityUid
+                          })
+                          if (elem) {
+                            referenceBucket.push(elem)
+                          }
                         })
-                        if (elem) {
-                          referenceBucket.push(elem)
-                        }
-                      })
-                      entry[prop] = referenceBucket
+                        entry[prop] = referenceBucket
+                      }
 
                       return self.includeReferencesI(entry[prop], locale, references, parentUid)
                         .then(rs)

test/config.ts

@@ -0,0 +1,3 @@
+export const config = {
+  dbName: 'sync-test',
+}

test/data/author.ts

@@ -70,7 +70,7 @@ export const entries = [
     tags: ['8'],
     category: {
       reference_to: 'category',
-      values: ['c1']
+      values: 'c1'
     }
   },
   {
@@ -82,7 +82,7 @@ export const entries = [
     tags: ['10'],
     category: {
       reference_to: 'category',
-      values: ['c2']
+      values: 'c2'
     }
   }
 ]

test/index.ts

@@ -3,14 +3,20 @@
  */
 
 import { Contentstack } from '../src/contentstack'
+import { config } from './config'
 import { entries as authors } from './data/author'
 import { entries as blogs } from './data/blog'
 import { entries as categories } from './data/category'
 
-const Stack = Contentstack.Stack()
+const Stack = Contentstack.Stack(config)
 let db
 
 describe('core', () => {
+  beforeAll(() => {
+    return Stack.connect({dbName: 'sync-test'}).then((dbInstance) => {
+      db = dbInstance
+    })
+  })
   afterAll(() => {
     return Stack.close()
   })
@@ -19,17 +25,17 @@ describe('core', () => {
     expect(Contentstack.Stack()).toHaveProperty('connect')
   })
 
-  test('connect', () => {
-    Stack.connect().then((dbInstance) => {
-      db = dbInstance
-      // const keys = ['insertMany', 'insertOne', 'updateOne', 'updateMany', 'deleteOne', 'deleteMany']
-      // keys.forEach((key) => {
-      //   expect(dbInstance).toHaveProperty(key)
-      // })
-    }).catch((error) => {
-      expect(error).toBeNull()
-    })
-  })
+  // test('connect', () => {
+  //   Stack.connect().then((dbInstance) => {
+  //     // db = dbInstance
+  //     // const keys = ['insertMany', 'insertOne', 'updateOne', 'updateMany', 'deleteOne', 'deleteMany']
+  //     // keys.forEach((key) => {
+  //     //   expect(dbInstance).toHaveProperty(key)
+  //     // })
+  //   }).catch((error) => {
+  //     expect(error).toBeNull()
+  //   })
+  // })
 
   test('db inserts', () => {
     return db.collection('contents').insertMany(authors)