fix crypto-frontmatter

fuxingloh · Nov 10, 2023 · 85951da · 85951da
1 parent 5b60ade
commit 85951da
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/packages/crypto-frontmatter/src/index.ts b/packages/crypto-frontmatter/src/index.ts
@@ -30,9 +30,9 @@ export interface FrontmatterIndex {
     decimals: number;
     title?: string;
     description?: string;
-    tags?: string[];
-    links?: FrontmatterLink[];
-    images?: FrontmatterImage[];
+    tags: string[];
+    links: FrontmatterLink[];
+    images: FrontmatterImage[];
   };
 }
 

diff --git a/packages/crypto-frontmatter/src/index.unit.ts b/packages/crypto-frontmatter/src/index.unit.ts
@@ -3,7 +3,7 @@ import { expect, it } from '@jest/globals';
 import { getFrontmatterCollection, getFrontmatterContent, getFrontmatterIndex } from './index';
 
 it('should getFrontmatterCollection of eip155:1/erc20', async () => {
-  const collection = await getFrontmatterCollection('eip155:1', 'erc20');
+  const collection = getFrontmatterCollection('eip155:1', 'erc20');
   expect(collection).toStrictEqual(
     expect.arrayContaining([
       expect.objectContaining({
@@ -16,7 +16,7 @@ it('should getFrontmatterCollection of eip155:1/erc20', async () => {
 });
 
 it('should getFrontmatterIndex of eip155:1/erc20:0x00000000008943c65cAf789FFFCF953bE156f6f8', async () => {
-  const frontmatterIndex = await getFrontmatterIndex('eip155:1/erc20:0x00000000008943c65cAf789FFFCF953bE156f6f8');
+  const frontmatterIndex = getFrontmatterIndex('eip155:1/erc20:0x00000000008943c65cAf789FFFCF953bE156f6f8');
   expect(frontmatterIndex).toStrictEqual({
     fileId: expect.stringMatching(/[0-f]{64}/),
     type: 'Frontmatter',

diff --git a/website/app/[caip2]/[asset]/page.tsx b/website/app/[caip2]/[asset]/page.tsx
@@ -1,10 +1,10 @@
 import {
   FrontmatterIndex,
   getFrontmatterCollection,
+  getFrontmatterContent,
   getFrontmatterIndex,
   SupportedCollections,
 } from 'crypto-frontmatter';
-import { getFrontmatterContent } from 'crypto-frontmatter/content';
 import { Metadata } from 'next';
 import { notFound } from 'next/navigation';
 import type { ReactElement } from 'react';

diff --git a/workspace/contented-config/index.mjs b/workspace/contented-config/index.mjs
@@ -75,6 +75,18 @@ export default function config(options) {
           pattern: '**/README.md',
           processor: MDProcessor,
           fields: {
+            caip2: {
+              type: 'string',
+              resolve: () => {
+                return options.caip2;
+              },
+            },
+            namespace: {
+              type: 'string',
+              resolve: () => {
+                return options.namespace;
+              },
+            },
             symbol: {
               type: 'string',
               required: true,
@@ -85,11 +97,15 @@ export default function config(options) {
             },
             tags: {
               type: 'string[]',
-              required: false,
+              resolve: (value) => {
+                return value ?? [];
+              },
             },
             links: {
               type: 'object',
-              required: false,
+              resolve: (value) => {
+                return value ?? [];
+              },
             },
             /**
              * Populated by computeImageField
@@ -110,8 +126,6 @@ export default function config(options) {
               type: fileContent.type,
               fields: {
                 ...fileContent.fields,
-                caip2: options.caip2,
-                namespace: options.namespace,
                 images: await computeImageField(fileContent, filePath),
               },
               html: fileContent.html,