@vidispine/types 22.4.0-pre.9 → 23.1.0-pre.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vidispine/types",
-  "version": "22.4.0-pre.9",
+  "version": "23.1.0-pre.1",
   "license": "SEE LICENSE IN LICENSE.md",
   "publishConfig": {
     "access": "public"
@@ -9,18 +9,18 @@
   "homepage": "https://vidispine.github.io/vdt/",
   "types": "dist/index.d.ts",
   "devDependencies": {
-    "@vidispine/eslint-config-base": "22.4.0-pre.9",
-    "@vidispine/eslint-config-mdx": "22.4.0-pre.9",
-    "@vidispine/eslint-config-typescript": "22.4.0-pre.9",
-    "@vidispine/prettier-config": "22.4.0-pre.9",
-    "eslint": "8.23.1",
-    "prettier": "2.7.1",
+    "@vidispine/eslint-config-base": "23.1.0-pre.1",
+    "@vidispine/eslint-config-mdx": "23.1.0-pre.1",
+    "@vidispine/eslint-config-typescript": "23.1.0-pre.1",
+    "@vidispine/prettier-config": "23.1.0-pre.1",
+    "eslint": "8.28.0",
+    "prettier": "2.8.0",
     "rimraf": "3.0.2",
-    "rollup": "2.79.0",
+    "rollup": "2.79.1",
     "rollup-plugin-delete": "2.0.0",
-    "rollup-plugin-dts": "4.2.2",
-    "rollup-plugin-typescript2": "0.34.0",
-    "typescript": "4.8.3"
+    "rollup-plugin-dts": "4.2.3",
+    "rollup-plugin-typescript2": "0.34.1",
+    "typescript": "4.9.3"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",

package/src/index.ts

@@ -251,6 +251,7 @@ export type { ExternalTranscodeJobType } from './models/ExternalTranscodeJobType
 export type { ExternalTranscoderType } from './models/ExternalTranscoderType';
 export type { ExternalVideoMediaType } from './models/ExternalVideoMediaType';
 export type { FacetCountType } from './models/FacetCountType';
+export type { FacetFilterType } from './models/FacetFilterType';
 export type { FacetRangeType } from './models/FacetRangeType';
 export type { FacetType } from './models/FacetType';
 export type { FastStartSettingType } from './models/FastStartSettingType';
@@ -437,6 +438,9 @@ export type { MetadataFieldValueConstraintListDocument } from './models/Metadata
 export type { MetadataFieldValueConstraintListType } from './models/MetadataFieldValueConstraintListType';
 export type { MetadataFieldValueConstraintType } from './models/MetadataFieldValueConstraintType';
 export type { MetadataFieldValueType } from './models/MetadataFieldValueType';
+export type { MetadataGroupSearchDocument } from './models/MetadataGroupSearchDocument';
+export type { MetadataGroupSearchOperatorType } from './models/MetadataGroupSearchOperatorType';
+export type { MetadataGroupSearchType } from './models/MetadataGroupSearchType';
 export type { MetadataGroupValueType } from './models/MetadataGroupValueType';
 export type { MetadataListDocument } from './models/MetadataListDocument';
 export type { MetadataListType } from './models/MetadataListType';
@@ -584,6 +588,7 @@ export type { ResolutionType } from './models/ResolutionType';
 export type { ResourceDocument } from './models/ResourceDocument';
 export type { ResourceListDocument } from './models/ResourceListDocument';
 export type { ResourceListType } from './models/ResourceListType';
+export type { ResourceTagType } from './models/ResourceTagType';
 export type { ResourceType } from './models/ResourceType';
 export type { ResourceTypeListDocument } from './models/ResourceTypeListDocument';
 export type { ResourceTypeListType } from './models/ResourceTypeListType';
@@ -594,9 +599,11 @@ export type { ScheduledRequestListDocument } from './models/ScheduledRequestList
 export type { ScheduledRequestListType } from './models/ScheduledRequestListType';
 export type { ScheduledRequestType } from './models/ScheduledRequestType';
 export type { SearchAclType } from './models/SearchAclType';
+export type { SearchFacetType } from './models/SearchFacetType';
 export type { SearchFieldType } from './models/SearchFieldType';
 export type { SearchFilterType } from './models/SearchFilterType';
 export type { SearchGroupType } from './models/SearchGroupType';
+export type { SearchHighlightType } from './models/SearchHighlightType';
 export type { SearchHistoryDocument } from './models/SearchHistoryDocument';
 export type { SearchHistoryListType } from './models/SearchHistoryListType';
 export type { SearchHistoryType } from './models/SearchHistoryType';

package/src/models/FacetFilterType.ts

@@ -0,0 +1,7 @@
+import type { FacetRangeType } from './FacetRangeType';
+
+export type FacetFilterType = {
+  field: string;
+  range?: FacetRangeType;
+  value?: string;
+};

package/src/models/IndexingConfigurationType.ts

@@ -9,4 +9,8 @@ export type IndexingConfigurationType = {
     name: string;
     fullText: boolean;
   }>;
+  solrPath?: string;
+  solrCollection?: string;
+  zookeeperHost?: Array<string>;
+  elasticsearchPath?: string;
 };

package/src/models/ItemSearchType.ts

@@ -1,13 +1,15 @@
 import type { AutocompleteRequestType } from './AutocompleteRequestType';
 import type { CollectionCriterionType } from './CollectionCriterionType';
 import type { CriterionType } from './CriterionType';
-import type { FacetRangeType } from './FacetRangeType';
+import type { FacetFilterType } from './FacetFilterType';
 import type { ItemCriterionType } from './ItemCriterionType';
 import type { ItemSearchTextValueType } from './ItemSearchTextValueType';
 import type { SearchAclType } from './SearchAclType';
+import type { SearchFacetType } from './SearchFacetType';
 import type { SearchFieldType } from './SearchFieldType';
 import type { SearchFilterType } from './SearchFilterType';
 import type { SearchGroupType } from './SearchGroupType';
+import type { SearchHighlightType } from './SearchHighlightType';
 import type { SearchIntervalsType } from './SearchIntervalsType';
 import type { SearchOperatorType } from './SearchOperatorType';
 import type { ShapeCriterionType } from './ShapeCriterionType';
@@ -27,30 +29,13 @@ export type ItemSearchType = {
   item?: ItemCriterionType;
   shape?: ShapeCriterionType;
   file?: CriterionType;
-  facetFilter?: Array<{
-    field: string;
-    range?: FacetRangeType;
-    value?: string;
-  }>;
-  facet?: Array<{
-    field: string;
-    range?: Array<FacetRangeType>;
-    exclude?: Array<string>;
-    count?: boolean;
-    minCount?: number;
-    maxResults?: number;
-    name?: string;
-  }>;
+  facetFilter?: Array<FacetFilterType>;
+  facet?: Array<SearchFacetType>;
   sort?: Array<{
     field: string;
     order: SortingOrderType;
   }>;
-  highlight?: {
-    field?: Array<string>;
-    matchingOnly?: boolean;
-    prefix?: string;
-    suffix?: string;
-  };
+  highlight?: SearchHighlightType;
   suggestion?: SuggestionSearchType;
   autocomplete?: Array<AutocompleteRequestType>;
   cursor?: string;

package/src/models/MetadataGroupSearchDocument.ts

@@ -0,0 +1,3 @@
+import type { MetadataGroupSearchType } from './MetadataGroupSearchType';
+
+export type MetadataGroupSearchDocument = MetadataGroupSearchType;

package/src/models/MetadataGroupSearchOperatorType.ts

@@ -0,0 +1,10 @@
+import type { ItemSearchTextValueType } from './ItemSearchTextValueType';
+import type { SearchFieldType } from './SearchFieldType';
+import type { SearchOperationType } from './SearchOperationType';
+
+export type MetadataGroupSearchOperatorType = {
+  text?: Array<ItemSearchTextValueType>;
+  operator?: Array<MetadataGroupSearchOperatorType>;
+  field?: Array<SearchFieldType>;
+  operation: SearchOperationType;
+};

package/src/models/MetadataGroupSearchType.ts

@@ -0,0 +1,22 @@
+import type { FacetFilterType } from './FacetFilterType';
+import type { ItemSearchTextValueType } from './ItemSearchTextValueType';
+import type { MetadataGroupSearchOperatorType } from './MetadataGroupSearchOperatorType';
+import type { SearchFacetType } from './SearchFacetType';
+import type { SearchFieldType } from './SearchFieldType';
+import type { SearchFilterType } from './SearchFilterType';
+import type { SearchHighlightType } from './SearchHighlightType';
+import type { SortingOrderType } from './SortingOrderType';
+
+export type MetadataGroupSearchType = {
+  text?: Array<ItemSearchTextValueType>;
+  field?: Array<SearchFieldType>;
+  operator?: MetadataGroupSearchOperatorType;
+  filter?: Array<SearchFilterType>;
+  facetFilter?: Array<FacetFilterType>;
+  facet?: Array<SearchFacetType>;
+  highlight?: SearchHighlightType;
+  sort?: Array<{
+    field: string;
+    order: SortingOrderType;
+  }>;
+};

package/src/models/MetadataGroupValueType.ts

@@ -1,7 +1,7 @@
-import { MetadataFieldValueType } from './MetadataFieldValueType';
-
 import type { KeyValuePairType } from './KeyValuePairType';
+import type { MetadataFieldValueType } from './MetadataFieldValueType';
 import type { MetadataReferencedType } from './MetadataReferencedType';
+import type { MetadataReferenceType } from './MetadataReferenceType';
 import type { MetadataValueAttributes } from './MetadataValueAttributes';
 
 export type MetadataGroupValueType = MetadataValueAttributes & {
@@ -9,9 +9,9 @@ export type MetadataGroupValueType = MetadataValueAttributes & {
   id?: Array<string>;
   referenced?: MetadataReferencedType;
   data?: Array<KeyValuePairType>;
+  field?: Array<MetadataFieldValueType>;
+  group?: Array<MetadataGroupValueType>;
+  reference?: MetadataReferenceType;
   inheritance?: string;
   cycle?: boolean;
-} & {
-  group?: MetadataGroupValueType[];
-  field?: MetadataFieldValueType[];
 };

package/src/models/ResourceTagType.ts

@@ -0,0 +1,6 @@
+import type { KeyValuePairType } from './KeyValuePairType';
+
+export type ResourceTagType = KeyValuePairType & {
+  sourceName?: string;
+  sourceType?: string;
+};

package/src/models/SearchFacetType.ts

@@ -0,0 +1,11 @@
+import type { FacetRangeType } from './FacetRangeType';
+
+export type SearchFacetType = {
+  field: string;
+  range?: Array<FacetRangeType>;
+  exclude?: Array<string>;
+  count?: boolean;
+  minCount?: number;
+  maxResults?: number;
+  name?: string;
+};

package/src/models/SearchGroupType.ts

@@ -1,6 +1,10 @@
+import type { SearchFieldType } from './SearchFieldType';
 import type { SearchOperatorType } from './SearchOperatorType';
 
 export type SearchGroupType = {
   name?: string;
   operator?: SearchOperatorType;
+  field?: Array<SearchFieldType>;
+  group?: Array<SearchGroupType>;
+  reference?: string;
 };

package/src/models/SearchHighlightType.ts

@@ -0,0 +1,6 @@
+export type SearchHighlightType = {
+  field?: Array<string>;
+  matchingOnly?: boolean;
+  prefix?: string;
+  suffix?: string;
+};

package/src/models/SearchResultEntryTimespanType.ts

@@ -3,6 +3,10 @@ export type SearchResultEntryTimespanType = {
     name: string;
     value?: Array<string>;
   }>;
+  group?: Array<{
+    name: string;
+    id?: string;
+  }>;
   start: string;
   end: string;
 };

package/src/models/StorageMethodType.ts

@@ -1,3 +1,4 @@
+import type { ResourceTagType } from './ResourceTagType';
 import type { SimpleMetadataType } from './SimpleMetadataType';
 import type { SiteIdType } from './SiteIdType';
 
@@ -14,10 +15,5 @@ export type StorageMethodType = {
   failureMessage?: string;
   type?: string;
   metadata?: SimpleMetadataType;
-  resourceTag?: Array<{
-    key: string;
-    value: string;
-    sourceName?: string;
-    sourceType?: string;
-  }>;
+  resourceTag?: Array<ResourceTagType>;
 };

package/src/models/StorageType.ts

@@ -1,3 +1,4 @@
+import type { ResourceTagType } from './ResourceTagType';
 import type { SimpleMetadataType } from './SimpleMetadataType';
 import type { SiteIdType } from './SiteIdType';
 import type { StorageFileSequenceType } from './StorageFileSequenceType';
@@ -26,10 +27,5 @@ export type StorageType = {
   archiveScript?: string;
   sequence?: Array<StorageFileSequenceType>;
   sequenceTimeout?: number;
-  resourceTag?: Array<{
-    key: string;
-    value: string;
-    sourceName?: string;
-    sourceType?: string;
-  }>;
+  resourceTag?: Array<ResourceTagType>;
 };

package/src/models/TaskDefinitionType.ts

@@ -13,5 +13,8 @@ export type TaskDefinitionType = {
   critical?: boolean;
   script?: string;
   metadata?: SimpleMetadataType;
+  bean?: string;
+  method?: string;
+  plugin?: boolean;
   id?: number;
 };

package/src/models/TranscoderType.ts

@@ -1,4 +1,5 @@
 import type { JobStatusType } from './JobStatusType';
+import type { KeyValuePairType } from './KeyValuePairType';
 import type { TranscoderConfigurationType } from './TranscoderConfigurationType';
 import type { TranscoderDirectAccess } from './TranscoderDirectAccess';
 
@@ -15,4 +16,5 @@ export type TranscoderType = {
   transcoder?: Array<TranscoderType>;
   weight?: number;
   maxJob?: number;
+  resourceTag?: Array<KeyValuePairType>;
 };

package/src/modifiedModels/MetadataGroupValueType.ts

@@ -1,17 +0,0 @@
-// import { MetadataFieldValueType } from './MetadataFieldValueType';
-
-// import type { KeyValuePairType } from './KeyValuePairType';
-// import type { MetadataReferencedType } from './MetadataReferencedType';
-// import type { MetadataValueAttributes } from './MetadataValueAttributes';
-
-// export type MetadataGroupValueType = MetadataValueAttributes & {
-//   name?: string;
-//   id?: Array<string>;
-//   referenced?: MetadataReferencedType;
-//   data?: Array<KeyValuePairType>;
-//   inheritance?: string;
-//   cycle?: boolean;
-// } & {
-//   group?: MetadataGroupValueType[];
-//   field?: MetadataFieldValueType[];
-// };

package/src/modifiedModels/README.md

@@ -1,3 +0,0 @@
-Currently these modifications are manually created for the models to map with the vidicore models
-
-After generating new models, replace the models with these if they are still needed