Merge pull request #40 from datocms/feat/site-search-source

Update schema

Author: sistrall

generate/extractInfoFromSchema.ts

@@ -84,6 +84,10 @@ const relToMethodName: Record<string, string> = {
   me: 'findMe',
 };
 
+const pluralExceptions: Record<string, string> = {
+  search_index: 'search_indexes',
+};
+
 function hasLinks(
   schema: JsonRefParser.JSONSchema,
 ): schema is JSONSchemaWithLinks {
@@ -431,21 +435,22 @@ function generateResourceInfo(
     return endpointInfo;
   });
 
+  const shouldPluralize = endpoints.some(
+    (e) =>
+      e.name === 'query' ||
+      e.name === 'list' ||
+      e.name.endsWith('List') ||
+      (e.name === 'find' && e.urlPlaceholders.length === 1),
+  );
+
+  const namespace = shouldPluralize
+    ? pluralExceptions[jsonApiType] || `${jsonApiType}s`
+    : jsonApiType;
+
   return {
     jsonApiType,
     endpoints,
-    namespace: toSafeName(
-      endpoints.some(
-        (e) =>
-          e.name === 'query' ||
-          e.name === 'list' ||
-          e.name.endsWith('List') ||
-          (e.name === 'find' && e.urlPlaceholders.length === 1),
-      )
-        ? `${jsonApiType}s`
-        : jsonApiType,
-      false,
-    ),
+    namespace: toSafeName(namespace, false),
     resourceClassName: toSafeName(jsonApiType, true),
   };
 }

packages/cma-client-browser/src/generated/resources.ts

@@ -17,6 +17,7 @@ export const JobResult = Resources.JobResult;
 export const SubscriptionLimit = Resources.SubscriptionLimit;
 export const SubscriptionFeature = Resources.SubscriptionFeature;
 export const BuildEvent = Resources.BuildEvent;
+export const SearchIndexEvent = Resources.SearchIndexEvent;
 export const Item = Resources.Item;
 export const ItemVersion = Resources.ItemVersion;
 export { default as Upload } from '../resources/Upload';
@@ -30,6 +31,7 @@ export const MaintenanceMode = Resources.MaintenanceMode;
 export const Webhook = Resources.Webhook;
 export const WebhookCall = Resources.WebhookCall;
 export const BuildTrigger = Resources.BuildTrigger;
+export const SearchIndex = Resources.SearchIndex;
 export const ItemTypeFilter = Resources.ItemTypeFilter;
 export const UploadFilter = Resources.UploadFilter;
 export const SiteInvitation = Resources.SiteInvitation;

packages/cma-client-node/__tests__/searchResults.test.ts

@@ -17,13 +17,33 @@ describe('Search Results', () => {
       indexing_enabled: true,
     });
 
-    const results = await client.searchResults.list({
-      filter: {
-        query: 'project',
-        build_trigger_id: trigger.id,
-      },
+    // Create a site search source linked to the build trigger
+    const searchIndex = await client.searchIndexes.create({
+      name: 'Test Search Index',
+      enabled: true,
+      frontend_url: 'http://www.google.com/',
+      build_triggers: [trigger],
     });
 
-    expect(results).toHaveLength(0);
+    const resultsWhenSearchingViaBuildTrigger = await client.searchResults.list(
+      {
+        filter: {
+          query: 'project',
+          build_trigger_id: trigger.id,
+        },
+      },
+    );
+
+    expect(resultsWhenSearchingViaBuildTrigger).toHaveLength(0);
+
+    const resultsWhenSearchingViaSiteSearchIndex =
+      await client.searchResults.list({
+        filter: {
+          query: 'project',
+          site_search_source_id: searchIndex.id,
+        },
+      });
+
+    expect(resultsWhenSearchingViaSiteSearchIndex).toHaveLength(0);
   });
 });

packages/cma-client-node/src/generated/resources.ts

@@ -17,6 +17,7 @@ export const JobResult = Resources.JobResult;
 export const SubscriptionLimit = Resources.SubscriptionLimit;
 export const SubscriptionFeature = Resources.SubscriptionFeature;
 export const BuildEvent = Resources.BuildEvent;
+export const SearchIndexEvent = Resources.SearchIndexEvent;
 export const Item = Resources.Item;
 export const ItemVersion = Resources.ItemVersion;
 export { default as Upload } from '../resources/Upload';
@@ -30,6 +31,7 @@ export const MaintenanceMode = Resources.MaintenanceMode;
 export const Webhook = Resources.Webhook;
 export const WebhookCall = Resources.WebhookCall;
 export const BuildTrigger = Resources.BuildTrigger;
+export const SearchIndex = Resources.SearchIndex;
 export const ItemTypeFilter = Resources.ItemTypeFilter;
 export const UploadFilter = Resources.UploadFilter;
 export const SiteInvitation = Resources.SiteInvitation;