fix search

Author: mansona

.env.example

@@ -1,4 +1,2 @@
 ALGOLIA_APP_ID=""
 ALGOLIA_ADMIN_KEY=""
-AWS_ACCESS_KEY=""
-AWS_SECRET_KEY=""

Procfile

@@ -1,12 +1,8 @@
-require = require('esm')(module)
-const program = require('commander')
+import program from 'commander';
 
-const { version, description } = require('./package.json')
-const { runApi } = require('./lib/api')
+import { runApi } from './lib/api.js'
 
 program
-  .version(version, '-v, --version')
-  .description(description)
   .option(
     '-c, --clear-index',
     'Whether indexes of the project should be cleared while processing'
@@ -16,9 +12,9 @@ program
 program.on('--help', function() {
   console.log(`
     Examples:
-        $ yarn start
-        $ yarn start -j # to write to fs
-        $ yarn start -c # Clear indexes before populating content
+        $ npm start
+        $ npm start -- -j # to write to fs
+        $ npm start -- -c # Clear indexes before populating content
     `)
 })
 

index.js

@@ -1,20 +1,20 @@
-require('dotenv').config()
+import 'dotenv/config'
 
-import { readJsonSync } from 'fs-extra'
+import fsExtra from 'fs-extra'
 import { difference } from 'lodash-es'
 import { gt, compare as compareSemVers } from 'semver'
-import downloadApiDocs from './api-docs-sync'
-import algoliaDriver from './drivers/algolia'
-import jsonDriver from './drivers/json'
-import schemas from './schemas'
+
+import algoliaDriver from './drivers/algolia.js'
+import jsonDriver from './drivers/json.js'
+import schemas from './schemas/index.js'
+
+const { readJsonSync } = fsExtra;
 
 const apiIndexes = ['modules', 'classes', 'methods', 'versions']
 
 export async function runApi(clearIndex = false, useJsonDriver = false) {
   let driver = useJsonDriver ? jsonDriver : algoliaDriver
 
-  await downloadApiDocs()
-
   apiIndexes.map(driver.init)
 
   if (clearIndex) {
@@ -32,7 +32,7 @@ async function processDocs(driver, project) {
 
   const {
     meta: { availableVersions },
-  } = readJsonSync(`./tmp/rev-index/${project}.json`)
+  } = readJsonSync(`../ember-api-docs-data/rev-index/${project}.json`)
 
   let versionsToProcess = difference(availableVersions, prevIndexedVersions)
 
@@ -89,7 +89,7 @@ function addIfLatestPatch(latestPatches, version) {
 }
 
 function filterMissingRevs(version, libName) {
-  const emberVersionJSONPath = `./tmp/rev-index/${libName}-${version}.json`
+  const emberVersionJSONPath = `../ember-api-docs-data/rev-index/${libName}-${version}.json`
   let isIncluded = true
   try {
     readJsonSync(emberVersionJSONPath)
@@ -100,7 +100,7 @@ function filterMissingRevs(version, libName) {
 }
 
 function readIndexFileForVersion(version, libName) {
-  const emberVersionJSONPath = `./tmp/rev-index/${libName}-${version}.json`
+  const emberVersionJSONPath = `../ember-api-docs-data/rev-index/${libName}-${version}.json`
   console.debug(`OPENING:: ${emberVersionJSONPath}`)
   return readJsonSync(emberVersionJSONPath)
 }
@@ -111,20 +111,24 @@ function fetchPublicModuleClassesForVersion(versionIndexObject, libName) {
   ].data.map(module => {
     // Module names are uri encoded
     const id = encodeURIComponent(module.id)
-    const modulePath = `./tmp/json-docs/${libName}/${
+    if(!versionIndexObject.meta.module[id]){
+      console.warn(`Skipping processing module ${id} because it's missing a meta entry`);
+      return null;
+    }
+    const modulePath = `../ember-api-docs-data/json-docs/${libName}/${
       versionIndexObject.data.attributes.version
     }/modules/${versionIndexObject.meta.module[id]}.json`
 
     console.debug(`OPENING:: ${modulePath}`)
     return readJsonSync(modulePath)
-  })
+  }).filter(Boolean)
 
   const publicClasses = versionIndexObject.data.relationships[
     'public-classes'
   ].data.map(classObj => {
     // Class names are uri encoded
     const id = encodeURIComponent(classObj.id)
-    const classPath = `./tmp/json-docs/${libName}/${
+    const classPath = `../ember-api-docs-data/json-docs/${libName}/${
       versionIndexObject.data.attributes.version
     }/classes/${versionIndexObject.meta.class[id]}.json`
 

lib/api-docs-sync.js

@@ -1,4 +1,4 @@
-require('dotenv').config()
+import 'dotenv/config'
 
 import AlgoliaSearch from 'algoliasearch'
 

lib/api.js

@@ -1,10 +1,12 @@
-import {
+import fsExtra from 'fs-extra'
+
+const {
   emptyDirSync,
   existsSync,
   outputJsonSync,
   readJsonSync,
   rmdirSync,
-} from 'fs-extra'
+} = fsExtra;
 
 const { resolve } = Promise
 

lib/drivers/algolia.js

@@ -1,5 +1,5 @@
-import classSchema from './class'
-import moduleSchema from './module'
-import methodSchema from './method'
+import classSchema from './class.js'
+import moduleSchema from './module.js'
+import methodSchema from './method.js'
 
 export default { moduleSchema, classSchema, methodSchema }