Merge pull request #48 from mitre-attack/add-spec-versions-getters

Some minor schema fixes + exporting global const `ATTACK_SPEC_VERSION`

Author: elucchesileon

src/attack-spec-version.ts

@@ -0,0 +1 @@
+export const ATTACK_SPEC_VERSION = '3.3.0' as const;

src/index.ts

@@ -1,5 +1,6 @@
+export { ATTACK_SPEC_VERSION } from '@/attack-spec-version.js';
 export * from '@/classes/index.js';
 export * from '@/data-sources/index.js';
-export * from '@/schemas/index.js';
-export * from '@/refinements/index.js';
 export * from '@/main.js';
+export * from '@/refinements/index.js';
+export * from '@/schemas/index.js';

src/schemas/common/common-properties.ts

@@ -263,6 +263,7 @@ export const objectMarkingRefsSchema = z
       'Identifier must start with "marking-definition--"',
     ),
   )
+  .nonempty()
   .meta({
     description: 'The list of marking-definition objects to be applied to this object.',
   });

src/schemas/sdo/group.schema.ts

@@ -7,6 +7,7 @@ import {
   createAttackExternalReferencesSchema,
   createStixIdValidator,
   stixTimestampSchema,
+  xMitreContributorsSchema,
   xMitreDomainsSchema,
   xMitreModifiedByRefSchema,
 } from '../common/index.js';
@@ -30,7 +31,7 @@ export const groupSchema = attackBaseDomainObjectSchema
 
     x_mitre_domains: xMitreDomainsSchema,
 
-    x_mitre_contributors: z.array(z.string()).optional(),
+    x_mitre_contributors: xMitreContributorsSchema.optional(),
 
     x_mitre_modified_by_ref: xMitreModifiedByRefSchema.optional(),
 

src/schemas/sdo/software.schema.ts

@@ -5,8 +5,8 @@ import {
   createMultiStixTypeValidator,
   descriptionSchema,
   externalReferencesSchema,
-  objectMarkingRefsSchema,
   stixCreatedByRefSchema,
+  xMitreContributorsSchema,
   xMitreDomainsSchema,
   xMitreModifiedByRefSchema,
   xMitrePlatformsSchema,
@@ -29,13 +29,11 @@ export const softwareSchema = attackBaseDomainObjectSchema.extend({
 
   external_references: externalReferencesSchema,
 
-  object_marking_refs: objectMarkingRefsSchema,
-
   // Malware: Required
   // Tool: Optional
   x_mitre_platforms: xMitrePlatformsSchema.optional(),
 
-  x_mitre_contributors: z.array(z.string()).optional(),
+  x_mitre_contributors: xMitreContributorsSchema.optional(),
 
   x_mitre_aliases: aliasesSchema.optional().meta({
     description: