.include() support added

Author: iyerrama29

.gitignore

@@ -9,6 +9,7 @@ coverage
 example/**/*
 !example/index.js
 
-# Random files
+# Random files/folders
+playground
 newQueryBuilder.ts
-query-builder.ts
+query-builder.ts

dist/config.js

@@ -7,11 +7,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.config = {
     contentStore: {
-        collectionName: 'contents',
-        dbName: 'contentstack-persistent-db',
+        collection: {
+            entry: 'contents',
+            asset: 'contents',
+            schema: 'content_types',
+        },
+        dbName: 'contentstack-db',
         indexes: {
-            published_at: -1,
-            content_type_uid: 1,
+            event_at: -1,
+            _content_type_uid: 1,
             locale: 1,
             uid: 1
         },
@@ -20,7 +24,7 @@ exports.config = {
             assets: '_assets'
         },
         limit: 100,
-        locales: [],
+        locale: 'en-us',
         // http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html
         options: {
             autoReconnect: true,
@@ -34,9 +38,10 @@ exports.config = {
         projections: {
             _id: 0,
             _version: 0,
-            content_type_uid: 0,
+            _content_type_uid: 0,
+            _synced_at: 0,
+            app_user_object_uid: 0,
             created_at: 0,
-            sys_keys: 0,
             updated_at: 0,
             updated_by: 0,
         },

dist/stack.js

@@ -50,28 +50,31 @@ const getParents = (child, mapping) => {
     }
     return parents;
 };
-const validateLocales = (config) => {
-    if (!(config.locales) || typeof config.locales !== 'object' || !(config.locales instanceof Array)) {
-        throw new Error(`Kindly provide 'config.locales: [ { code: '' }, ...]'`);
-    }
-    config.locales.forEach((locale) => {
-        if (!(locale) || typeof locale.code !== 'string' || locale.code.length === 0) {
-            throw new Error(`Locale ${locale} is invalid!`);
-        }
-    });
-    return;
-};
 const validateContentStore = (contentStore) => {
     if (typeof contentStore.dbName !== 'string' || contentStore.dbName.length === 0) {
         throw new Error(`Contentstore dbName should be of type string and not empty!`);
     }
-    if (typeof contentStore.collectionName !== 'string' || contentStore.collectionName.length === 0) {
-        throw new Error(`Contentstore collectionName should be of type string and not empty!`);
+    if (typeof contentStore.collectionName === 'string') {
+        contentStore.collection = {
+            asset: contentStore.collectionName,
+            entry: contentStore.collectionName,
+            schema: contentStore.collectionName,
+        };
+        delete contentStore.collectionName;
     }
     return;
 };
 exports.validateConfig = (config) => {
-    validateLocales(config);
     validateContentStore(config.contentStore);
     return;
 };
+exports.getCollectionName = ({ locale, content_type_uid }, collection) => {
+    switch (content_type_uid) {
+        case '_assets':
+            return `${locale}.${collection.asset}`;
+        case '_content_types':
+            return `${locale}.${collection.schema}`;
+        default:
+            return `${locale}.${collection.entry}`;
+    }
+};

dist/util.js

@@ -1,19 +1,14 @@
 const Contentstack = require('../dist').Contentstack
 
 const Stack = Contentstack.Stack({
-  locales: [
-    {
-      code: 'en-us',
-      relative_url_prefix: '/'
-    },
-    {
-      code: 'es-es',
-      relative_url_prefix: '/es/'
-    }
-  ],
+  // locale: 'en-us',
   contentStore: {
-    dbName: 'mydb',
-    collectionName: 'dev'
+    dbName: 'references',
+    collection: {
+      entry: 'contents',
+      asset: 'contents',
+      schema: 'content_types'
+    }
   }
 })
 
@@ -29,18 +24,26 @@ function close () {
   return Stack.close()
 }
 
-function find (contentType = 'authors') {
+function find (contentType = 'blog') {
   return new Promise((resolve, reject) => {
     Stack.contentType(contentType)
       .entries()
-      .includeCount()
-      .includeReferences()
-      .includeSchema()
-      .language('es-es')
-      .notEqualTo('title', 'Kolan')
-      .query({tags: {$in: ['one', 'two']}})
-      .limit(10)
-      .skip(1)
+      // .includeCount()
+      // .include(['reference_b'])
+      // .include([
+      //   'group.group.reference.reference_b.reference.reference',
+      // ])
+      // .include(['group.group.reference.reference_b.reference.reference', 'group.group.reference.reference_one',
+      //   'group.group.reference.reference_two', 'group.group.reference.self_reference',
+      //   'modular_blocks.block_one.reference', 'modular_blocks.block_two.group.reference.authors',
+      //   'modular_blocks.block_two.group.reference.categories'
+      // ])
+      // .includeSchema()
+      // .language('es-es')
+      // .notEqualTo('title', 'Kolan')
+      // .query({tags: {$in: ['one', 'two']}})
+      .limit(1)
+      // .skip(1)
       .find()
       .then(resolve)
       .catch(reject)
@@ -49,8 +52,10 @@ function find (contentType = 'authors') {
 
 return connect()
   .then(() => {
+    console.time('t')
     return find()
       .then((result) => {
+        console.timeEnd('t')
         const keys = Object.keys(result)
         // Sample output
         // {

example/index.js

@@ -6,11 +6,15 @@
 
 export const config = {
   contentStore: {
-    collectionName: 'contents',
-    dbName: 'contentstack-persistent-db',
+    collection: {
+      entry: 'contents',
+      asset: 'contents',
+      schema: 'content_types',
+    },
+    dbName: 'contentstack-db',
     indexes: {
-      published_at: -1,
-      content_type_uid: 1,
+      event_at: -1,
+      _content_type_uid: 1,
       locale: 1,
       uid: 1
     },
@@ -19,8 +23,7 @@ export const config = {
       assets: '_assets'
     },
     limit: 100,
-    locales: [
-    ],
+    locale: 'en-us',
     // http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html
     options: {
       autoReconnect: true,
@@ -34,9 +37,10 @@ export const config = {
     projections: {
       _id: 0,
       _version: 0,
-      content_type_uid: 0,
+      _content_type_uid: 0,
+      _synced_at: 0,
+      app_user_object_uid: 0,
       created_at: 0,
-      sys_keys: 0,
       updated_at: 0,
       updated_by: 0,
     },