@bottlebooks/valid-values 7.2.1 → 7.2.2

package/src/validValues/packagingMaterialType/packagingMaterialType.ts

@@ -1,37 +1,13 @@
 import { defineMessage } from '@lingui/macro';
-import type {
-  ValidValueDefinition,
-  ValidValueDataDefinition,
-} from '../types/ValidValueDefinition';
-import type { MessageDescriptor } from '@lingui/core';
-const genericRecyclingLogo =
-  'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/00_Generic_Recycling.svg';
-const categories = [
-  'plastics',
-  'batteries',
-  'paper',
-  'metals',
-  'glass',
-  'composites',
-  'biodegradable',
-] as const;
-export type MaterialCategory = typeof categories[number];
 
-interface PackagingMaterialType
-  extends ValidValueDefinition,
-    ValidValueDataDefinition {
-  isDeprecated?: boolean;
-  code: string;
-  category: MaterialCategory;
-  metadata?: {
-    deprecationDescription?: MessageDescriptor;
-  };
-}
-
-/** Makes sure errors are displayed where the error is introduced. */
-const packagingMaterialType = (value: PackagingMaterialType) => value;
+import packagingMaterialType_deprecated from './packagingMaterialType_deprecated';
+import {
+  genericRecyclingLogo,
+  packagingMaterialType,
+} from './packagingMaterialTypes';
 
 const allPackagingMaterialTypes = {
+  ...packagingMaterialType_deprecated,
   '01_PET': packagingMaterialType({
     key: '01_PET',
     code: '01 PET(E)',
@@ -320,16 +296,19 @@ const allPackagingMaterialTypes = {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/61_TEX.svg',
     },
   }),
-  '62-69_TEX': packagingMaterialType({
-    key: '62-69_TEX',
-    code: '62-69 TEX',
+  '62_TEX': packagingMaterialType({
+    key: '62_TEX',
+    code: '62 TEX',
     category: 'biodegradable',
     label: defineMessage({
-      id: 'validValues.packagingMaterialType.62-69_TEX',
+      id: 'validValues.packagingMaterialType.62_TEX',
       message: 'Other textiles',
     }),
     data: {
-      logo: genericRecyclingLogo,
+      logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/62_TEX.svg',
+    },
+    metadata: {
+      tags: ['COMPOSITE'],
     },
   }),
   '70_GL': packagingMaterialType({
@@ -452,17 +431,20 @@ const allPackagingMaterialTypes = {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/79_GL.svg',
     },
   }),
-  '80_Paper': packagingMaterialType({
-    key: '80_Paper',
-    code: '80 Paper',
+  '80_C_PAP': packagingMaterialType({
+    key: '80_C_PAP',
+    code: '80 C/PAP',
     category: 'paper',
     label: defineMessage({
-      id: 'validValues.packagingMaterialType.80_Paper',
+      id: 'validValues.packagingMaterialType.80_C_PAP',
       message: 'Paper and miscellaneous metals',
     }),
     data: {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/80_C_PAP.svg',
     },
+    metadata: {
+      tags: ['COMPOSITE'],
+    },
   }),
   '81_PapPet': packagingMaterialType({
     key: '81_PapPet',
@@ -475,24 +457,8 @@ const allPackagingMaterialTypes = {
     data: {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/81_C_PAP.svg',
     },
-  }),
-  '82': packagingMaterialType({
-    isDeprecated: true,
-    key: '82',
-    code: '82',
-    category: 'composites',
-    label: defineMessage({
-      id: 'validValues.packagingMaterialType.82',
-      message: 'Paper and fibreboard/Aluminium',
-    }),
-    data: {
-      logo: genericRecyclingLogo,
-    },
     metadata: {
-      deprecationDescription: defineMessage({
-        id: 'validValues.packagingMaterialType.82.deprecationDescription',
-        message: 'Use 82 C/PAP instead.',
-      }),
+      tags: ['COMPOSITE'],
     },
   }),
   '82_C_PAP': packagingMaterialType({
@@ -506,24 +472,8 @@ const allPackagingMaterialTypes = {
     data: {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/82_C_PAP.svg',
     },
-  }),
-  '83': packagingMaterialType({
-    isDeprecated: true,
-    key: '83',
-    code: '83',
-    category: 'composites',
-    label: defineMessage({
-      id: 'validValues.packagingMaterialType.83',
-      message: 'Paper and fibreboard/Tinplate',
-    }),
-    data: {
-      logo: genericRecyclingLogo,
-    },
     metadata: {
-      deprecationDescription: defineMessage({
-        id: 'validValues.packagingMaterialType.83.deprecationDescription',
-        message: 'Use 83 C/PAP instead.',
-      }),
+      tags: ['COMPOSITE'],
     },
   }),
   '83_C_PAP': packagingMaterialType({
@@ -537,11 +487,14 @@ const allPackagingMaterialTypes = {
     data: {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/83_C_PAP.svg',
     },
+    metadata: {
+      tags: ['COMPOSITE'],
+    },
   }),
   '84_C_PAP': packagingMaterialType({
     key: '84_C_PAP',
     code: '84 C/PAP',
-    category: 'composites',
+    category: 'paper',
     label: defineMessage({
       id: 'validValues.packagingMaterialType.84_C_PAP',
       message: 'Paper and cardboard/plastic/aluminium',
@@ -549,24 +502,8 @@ const allPackagingMaterialTypes = {
     data: {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/84_C_PAP.svg',
     },
-  }),
-  '85': packagingMaterialType({
-    isDeprecated: true,
-    key: '85',
-    code: '85',
-    category: 'composites',
-    label: defineMessage({
-      id: 'validValues.packagingMaterialType.85',
-      message: 'Paper and fibreboard/Plastic/Aluminium/Tinplate',
-    }),
-    data: {
-      logo: genericRecyclingLogo,
-    },
     metadata: {
-      deprecationDescription: defineMessage({
-        id: 'validValues.packagingMaterialType.85.deprecationDescription',
-        message: 'Use 85 C/PAP instead.',
-      }),
+      tags: ['COMPOSITE'],
     },
   }),
   '85_C_PAP': packagingMaterialType({
@@ -580,11 +517,14 @@ const allPackagingMaterialTypes = {
     data: {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/85_C_PAP.svg',
     },
+    metadata: {
+      tags: ['COMPOSITE'],
+    },
   }),
   '87_CSL': packagingMaterialType({
     key: '87_CSL',
     code: '87 CSL',
-    category: 'composites',
+    category: 'biodegradable',
     label: defineMessage({
       id: 'validValues.packagingMaterialType.87_CSL',
       message: 'Biodegradable plastic',
@@ -592,11 +532,14 @@ const allPackagingMaterialTypes = {
     data: {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/87_CSL.png',
     },
+    metadata: {
+      tags: ['COMPOSITE'],
+    },
   }),
   '90_C_LDPE': packagingMaterialType({
     key: '90_C_LDPE',
     code: '90 C/LDPE',
-    category: 'composites',
+    category: 'plastics',
     label: defineMessage({
       id: 'validValues.packagingMaterialType.90_C_LDPE',
       message: 'Plastics/Aluminium',
@@ -604,6 +547,9 @@ const allPackagingMaterialTypes = {
     data: {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/90_C_LDPE.png',
     },
+    metadata: {
+      tags: ['COMPOSITE'],
+    },
   }),
   '90_C_ALU': packagingMaterialType({
     key: '90_C_ALU',
@@ -616,6 +562,9 @@ const allPackagingMaterialTypes = {
     data: {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/90_C_ALU.svg',
     },
+    metadata: {
+      tags: ['COMPOSITE'],
+    },
   }),
   '90_C_PVC': packagingMaterialType({
     key: '90_C_PVC',
@@ -628,6 +577,9 @@ const allPackagingMaterialTypes = {
     data: {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/90_C_PVC.svg',
     },
+    metadata: {
+      tags: ['COMPOSITE'],
+    },
   }),
   '90_C_PETG': packagingMaterialType({
     key: '90_C_PETG',
@@ -640,11 +592,14 @@ const allPackagingMaterialTypes = {
     data: {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/90_C_PETG.svg',
     },
+    metadata: {
+      tags: ['COMPOSITE'],
+    },
   }),
   '91_C_LDPE': packagingMaterialType({
     key: '91_C_LDPE',
     code: '91 C/LDPE',
-    category: 'composites',
+    category: 'plastics',
     label: defineMessage({
       id: 'validValues.packagingMaterialType.91_C_LDPE',
       message: 'Plastic/Tinplate',
@@ -652,11 +607,14 @@ const allPackagingMaterialTypes = {
     data: {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/91_C_LDPE.png',
     },
+    metadata: {
+      tags: ['COMPOSITE'],
+    },
   }),
   '92': packagingMaterialType({
     key: '92',
     code: '92',
-    category: 'composites',
+    category: 'plastics',
     label: defineMessage({
       id: 'validValues.packagingMaterialType.92',
       message: 'Plastic/Miscellaneous metals',
@@ -664,11 +622,14 @@ const allPackagingMaterialTypes = {
     data: {
       logo: genericRecyclingLogo,
     },
+    metadata: {
+      tags: ['COMPOSITE'],
+    },
   }),
   '95': packagingMaterialType({
     key: '95',
     code: '95',
-    category: 'composites',
+    category: 'glass',
     label: defineMessage({
       id: 'validValues.packagingMaterialType.95',
       message: 'Glass/Plastic',
@@ -676,24 +637,8 @@ const allPackagingMaterialTypes = {
     data: {
       logo: genericRecyclingLogo,
     },
-  }),
-  '96': packagingMaterialType({
-    isDeprecated: true,
-    key: '96',
-    code: '96',
-    category: 'composites',
-    label: defineMessage({
-      id: 'validValues.packagingMaterialType.96',
-      message: 'Glass/Aluminium',
-    }),
-    data: {
-      logo: genericRecyclingLogo,
-    },
     metadata: {
-      deprecationDescription: defineMessage({
-        id: 'validValues.packagingMaterialType.96.deprecationDescription',
-        message: 'Use 96 C/GL instead.',
-      }),
+      tags: ['COMPOSITE'],
     },
   }),
   '96_C_GL': packagingMaterialType({
@@ -707,24 +652,8 @@ const allPackagingMaterialTypes = {
     data: {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/96_C_GL.svg',
     },
-  }),
-  '97': packagingMaterialType({
-    isDeprecated: true,
-    key: '97',
-    code: '97',
-    category: 'composites',
-    label: defineMessage({
-      id: 'validValues.packagingMaterialType.97',
-      message: 'Glass/Tinplate',
-    }),
-    data: {
-      logo: genericRecyclingLogo,
-    },
     metadata: {
-      deprecationDescription: defineMessage({
-        id: 'validValues.packagingMaterialType.97.deprecationDescription',
-        message: 'Use 97 C/GL instead.',
-      }),
+      tags: ['COMPOSITE'],
     },
   }),
   '97_C_GL': packagingMaterialType({
@@ -738,24 +667,8 @@ const allPackagingMaterialTypes = {
     data: {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/97_C_GL.svg',
     },
-  }),
-  '98': packagingMaterialType({
-    isDeprecated: true,
-    key: '98',
-    code: '98',
-    category: 'composites',
-    label: defineMessage({
-      id: 'validValues.packagingMaterialType.98',
-      message: 'Glass/Miscellaneous metals',
-    }),
-    data: {
-      logo: genericRecyclingLogo,
-    },
     metadata: {
-      deprecationDescription: defineMessage({
-        id: 'validValues.packagingMaterialType.98.deprecationDescription',
-        message: 'Use 98 C/GL instead.',
-      }),
+      tags: ['COMPOSITE'],
     },
   }),
   '98_C_GL': packagingMaterialType({
@@ -769,6 +682,9 @@ const allPackagingMaterialTypes = {
     data: {
       logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/98_C_GL.svg',
     },
+    metadata: {
+      tags: ['COMPOSITE'],
+    },
   }),
 } as const;
 

package/src/validValues/packagingMaterialType/packagingMaterialType_deprecated.ts

@@ -0,0 +1,167 @@
+import { defineMessage } from '@lingui/macro';
+
+import {
+  genericRecyclingLogo,
+  packagingMaterialType,
+} from './packagingMaterialTypes';
+
+const packagingMaterialType_deprecated = {
+  '62-69_TEX': packagingMaterialType({
+    isDeprecated: true,
+    key: '62-69_TEX',
+    code: '62-69 TEX',
+    category: 'biodegradable',
+    label: defineMessage({
+      id: 'validValues.packagingMaterialType.62-69_TEX',
+      message: 'Other textiles',
+    }),
+    data: {
+      logo: genericRecyclingLogo,
+    },
+    metadata: {
+      deprecationDescription: defineMessage({
+        id: 'validValues.packagingMaterialType.62-69_TEX.deprecationDescription',
+        message: 'Use 62 TEX instead.',
+      }),
+    }
+  }),
+  '80_Paper': packagingMaterialType({
+    isDeprecated: true,
+    key: '80_Paper',
+    code: '80 Paper',
+    category: 'paper',
+    label: defineMessage({
+      id: 'validValues.packagingMaterialType.80_Paper',
+      message: 'Paper and miscellaneous metals',
+    }),
+    data: {
+      logo: 'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/80_C_PAP.svg',
+    },
+    metadata: {
+      tags: ['COMPOSITE'],
+    },
+  }),
+  '82': packagingMaterialType({
+    isDeprecated: true,
+    key: '82',
+    code: '82',
+    category: 'paper',
+    label: defineMessage({
+      id: 'validValues.packagingMaterialType.82',
+      message: 'Paper and fibreboard/Aluminium',
+    }),
+    data: {
+      logo: genericRecyclingLogo,
+    },
+    metadata: {
+      tags: ['COMPOSITE'],
+      deprecationDescription: defineMessage({
+        id: 'validValues.packagingMaterialType.82.deprecationDescription',
+        message: 'Use 82 C/PAP instead.',
+      }),
+    },
+  }),
+  '83': packagingMaterialType({
+    isDeprecated: true,
+    key: '83',
+    code: '83',
+    category: 'paper',
+    label: defineMessage({
+      id: 'validValues.packagingMaterialType.83',
+      message: 'Paper and fibreboard/Tinplate',
+    }),
+    data: {
+      logo: genericRecyclingLogo,
+    },
+    metadata: {
+      tags: ['COMPOSITE'],
+      deprecationDescription: defineMessage({
+        id: 'validValues.packagingMaterialType.83.deprecationDescription',
+        message: 'Use 83 C/PAP instead.',
+      }),
+    },
+  }),
+
+  '85': packagingMaterialType({
+    isDeprecated: true,
+    key: '85',
+    code: '85',
+    category: 'paper',
+    label: defineMessage({
+      id: 'validValues.packagingMaterialType.85',
+      message: 'Paper and fibreboard/Plastic/Aluminium/Tinplate',
+    }),
+    data: {
+      logo: genericRecyclingLogo,
+    },
+    metadata: {
+      tags: ['COMPOSITE'],
+      deprecationDescription: defineMessage({
+        id: 'validValues.packagingMaterialType.85.deprecationDescription',
+        message: 'Use 85 C/PAP instead.',
+      }),
+    },
+  }),
+
+  '96': packagingMaterialType({
+    isDeprecated: true,
+    key: '96',
+    code: '96',
+    category: 'glass',
+    label: defineMessage({
+      id: 'validValues.packagingMaterialType.96',
+      message: 'Glass/Aluminium',
+    }),
+    data: {
+      logo: genericRecyclingLogo,
+    },
+    metadata: {
+      tags: ['COMPOSITE'],
+      deprecationDescription: defineMessage({
+        id: 'validValues.packagingMaterialType.96.deprecationDescription',
+        message: 'Use 96 C/GL instead.',
+      }),
+    },
+  }),
+  '97': packagingMaterialType({
+    isDeprecated: true,
+    key: '97',
+    code: '97',
+    category: 'glass',
+    label: defineMessage({
+      id: 'validValues.packagingMaterialType.97',
+      message: 'Glass/Tinplate',
+    }),
+    data: {
+      logo: genericRecyclingLogo,
+    },
+    metadata: {
+      tags: ['COMPOSITE'],
+      deprecationDescription: defineMessage({
+        id: 'validValues.packagingMaterialType.97.deprecationDescription',
+        message: 'Use 97 C/GL instead.',
+      }),
+    },
+  }),
+  '98': packagingMaterialType({
+    isDeprecated: true,
+    key: '98',
+    code: '98',
+    category: 'glass',
+    label: defineMessage({
+      id: 'validValues.packagingMaterialType.98',
+      message: 'Glass/Miscellaneous metals',
+    }),
+    data: {
+      logo: genericRecyclingLogo,
+    },
+    metadata: {
+      tags: ['COMPOSITE'],
+      deprecationDescription: defineMessage({
+        id: 'validValues.packagingMaterialType.98.deprecationDescription',
+        message: 'Use 98 C/GL instead.',
+      }),
+    },
+  }),
+} as const;
+export default packagingMaterialType_deprecated;

package/src/validValues/packagingMaterialType/packagingMaterialTypes.ts

@@ -0,0 +1,35 @@
+import type { MessageDescriptor } from '@lingui/core';
+
+import type { PackagingMaterialTag } from './PackagingMaterialTag';
+import type {
+  ValidValueDataDefinition,
+  ValidValueDefinition,
+} from '../types/ValidValueDefinition';
+
+/** Makes sure errors are displayed where the error is introduced. */
+export const packagingMaterialType = (value: PackagingMaterialType) => value;
+
+export const genericRecyclingLogo =
+  'https://cdn.bottlebooks.me/bottlebooks/img/logos/packagingMaterialType/00_Generic_Recycling.svg';
+
+const categories = [
+  'plastics',
+  'batteries',
+  'paper',
+  'metals',
+  'glass',
+  'biodegradable',
+] as const;
+export type MaterialCategory = typeof categories[number];
+
+export interface PackagingMaterialType
+  extends ValidValueDefinition,
+    ValidValueDataDefinition {
+  isDeprecated?: boolean;
+  code: string;
+  category: MaterialCategory;
+  metadata?: {
+    deprecationDescription?: MessageDescriptor;
+    tags?: PackagingMaterialTag[];
+  };
+}