Merge pull request #27 from oriverk/dev

Dev

Author: oriverk

.github/workflows/deploy.yml

@@ -17,13 +17,18 @@ jobs:
     name: build and deploy to Cloudflare Pages
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Run a build step here if your project requires
       - name: setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
+
+      - name: create dotenv
+        run: |
+          touch .env
+          echo "SECRET_GH_PAT={{ secrets.SECRET_GH_PAT }}" >> .env
 
       - name: install packages and build
         run: |
@@ -33,6 +38,7 @@ jobs:
         env:
           MODE: production
           SECRET_GH_PAT: ${{ secrets.SECRET_GH_PAT }}
+  
       - name: deploy to Cloudflare Pages
         uses: cloudflare/pages-action@v1
         with:

README.md

@@ -7,7 +7,6 @@
   - Svelte
   - unified, remark, rehype ...
   - @octokit/graphql
-  - algoliasearch
 - devDependencies
   - husky
   - biomejs

package-lock.json

@@ -19,9 +19,9 @@
   "scripts": {
     "clean": "rm -r ./contents/*.json ./src/content/static/cv.md",
     "script": "run-s script:*",
-    "script:feed": "node script/getFeed.mjs",
-    "script:github": "node -r dotenv/config script/getGitHubUserContent.mjs",
-    "script:cv": "node -r dotenv/config script/getGitHubRepositoryContent.mjs",
+    "script:feed": "npx tsx script/getFeed.mts",
+    "script:github": "npx tsx --env-file=.env script/getGitHubUserContent.mts",
+    "script:cv": "npx tsx --env-file=.env script/getGitHubRepositoryContent.mts",
     "astro": "astro",
     "sync": "astro sync",
     "dev": "astro dev",
@@ -41,16 +41,15 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@astrojs/mdx": "^4.0.0-beta.1",
-    "@astrojs/rss": "^4.0.7",
-    "@astrojs/svelte": "^6.0.0-beta.0",
+    "@astrojs/mdx": "^4.0.0-beta.2",
+    "@astrojs/rss": "^4.0.8",
+    "@astrojs/svelte": "^6.0.0-beta.1",
     "@expressive-code/plugin-line-numbers": "^0.37.0",
     "@octokit/graphql": "^8.1.1",
-    "astro": "^5.0.0-beta.2",
+    "astro": "^5.0.0-beta.4",
     "astro-expressive-code": "^0.37.0",
     "clsx": "^2.1.1",
     "date-fns": "^4.1.0",
-    "dotenv": "^16.4.5",
     "fetch-site-metadata": "^0.2.0",
     "gray-matter": "^4.0.3",
     "hast": "^1.0.0",
@@ -61,7 +60,7 @@
     "remark-comment": "^1.0.0",
     "remark-github-alerts": "^0.1.0-beta.3",
     "rss-parser": "^3.13.0",
-    "satori": "^0.11.1",
+    "satori": "^0.11.2",
     "sharp": "^0.33.5",
     "strip-markdown": "^6.0.0",
     "svelte": "^5.0.0-next.259",
@@ -72,19 +71,18 @@
     "url-join": "^5.0.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.9.2",
+    "@biomejs/biome": "1.9.3",
     "@commitlint/cli": "^19.5.0",
     "@commitlint/config-conventional": "^19.5.0",
-    "@octokit/graphql-schema": "^15.25.0",
     "@proofdict/textlint-rule-proofdict": "^3.1.2",
-    "@textlint/textlint-plugin-markdown": "^14.2.0",
+    "@textlint/textlint-plugin-markdown": "^14.2.1",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.7.0",
+    "@types/node": "^22.7.5",
     "fs-extra": "^11.2.0",
     "husky": "^9.1.6",
     "markdownlint-cli": "^0.42.0",
     "npm-run-all2": "^6.2.3",
-    "textlint": "^14.2.0",
+    "textlint": "^14.2.1",
     "textlint-filter-rule-allowlist": "^4.0.0",
     "textlint-plugin-latex2e": "^1.2.1",
     "textlint-rule-aws-service-name": "^1.11.0",
@@ -94,7 +92,7 @@
     "textlint-rule-period-in-list-item": "^1.0.1",
     "textlint-rule-preset-ja-spacing": "^2.4.3",
     "textlint-rule-preset-ja-technical-writing": "^10.0.1",
-    "ts-node": "^10.9.2"
+    "tsx": "^4.19.1"
   },
   "overrides": {
     "@sveltejs/vite-plugin-svelte": "^4.0.0-next.6"

package.json

@@ -1,21 +1,25 @@
 import fs from "node:fs";
 import Parser from 'rss-parser'
 
-/**
- * @typedef {Object} Source
- * @property {string} id
- * @property {string} url
- * @property {string} includeUrlRegex
- */
+type Source = {
+  id: string;
+  url: string;
+  includeUrlRegex?: string;
+}
+
+// [rbren/rss-parser: A lightweight RSS parser, for Node and the browser](https://github.com/rbren/rss-parser?tab=readme-ov-file#typescript)
+type CustomFeed = {
+  foo: string;
+}
 
-/**
- * @typedef {Object} FeedItem
- * @property {string} title
- * @property {string} link
- * @property {string} contentSnippet
- * @property {string} isoDate
- * @property {number} dateMiliSeconds
- */
+type FeedItem = {
+  id: string;
+  title: string;
+  link: string;
+  contentSnippet: string;
+  isoDate: string;
+  dateMiliSeconds: number;
+}
 
 const sources = [
   {
@@ -24,11 +28,7 @@ const sources = [
   },
 ];
 
-/**
- * @param {string} url
- * @returns {boolean}
- */
-function isValidUrl(url) {
+function isValidUrl(url: string) {
   try {
     const {protocol} = new URL(url);
     return protocol === 'http:' || protocol === 'https:';
@@ -37,47 +37,41 @@ function isValidUrl(url) {
   }
 }
 
-const parser = new Parser();
 
-/**
- * @param {string} url
- * @returns {FeedItem[]}
- */
-async function fetchFeedItems(url) {
+const parser: Parser<CustomFeed,FeedItem> = new Parser();
+
+async function fetchFeedItems(url: string) {
   const feed = await parser.parseURL(url);
 
   if(!feed?.items?.length) return []
 
-  return feed.items
+  const results = feed.items
+    .filter(({link}) => link && isValidUrl(link))
     .map(({ title, contentSnippet, link, isoDate }) => {
       return {
+        id: link,
         title,
         contentSnippet: contentSnippet?.replace(/\n/g, ""),
         link,
         isoDate,
         dateMiliSeconds: isoDate ? new Date(isoDate).getTime() : 0,
       };
     })
-    .filter(
-      ({ title, link }) => title && link && isValidUrl(link)
-    )
+  
+    return results
 }
 
-/**
- * @param {Source[]} sources
- * @returns {FeedItem[]}
- */
-async function getFeedItemsFromSources(sources) {
+async function getFeedItemsFromSources(sources: Source[]) {
   if (!sources.length) return [];
 
-  let feedItems = [];
+  let feedItems: FeedItem[] = [];
   for (const source of sources) {
     const { url, includeUrlRegex } = source;
     let items = await fetchFeedItems(url);
 
     if (includeUrlRegex) {
       items = items.filter(item => {
-        return item.link.match(new RegExp(includeUrlRegex))
+        return item.link?.match(new RegExp(includeUrlRegex))
       })
     }
 

public/assets/qiita-icon.png

@@ -3,10 +3,10 @@ import { format } from 'date-fns'
 import fs from "node:fs"
 
 /**
- * @param {string} birthdate '2020-01-01'
- * @returns {number}
+ * @param birthdate '2020-01-01'
+ * @returns 
  */
-function getAge(birthdate) {
+function getAge(birthdate: string) {
   const today = new Date()
   const birthDate = new Date(birthdate)
   let age = today.getFullYear() - birthDate.getFullYear()
@@ -17,37 +17,30 @@ function getAge(birthdate) {
   return age
 }
 
+type Content = {
+  repository: {
+    object: {
+      text: string;
+    }
+  }
+}
+
 /**
- * @param {string} githubToken
- * @param {string} owner userid
- * @param {number} pinnedItemsNum
- * @param {string} calendarFrom new Date().toISOString().split(".")[0]
- * @param {string} calendarTo "2023-04-01T00:00:00"
- * @returns {import("@octokit/graphql-schema").Repository}
+ * @param githubToken
+ * @param owner userid
+ * @param repo userid-docs
+ * @param expression HEAD:cv/index.md
+ * @returns 
  */
-async function fetchRepositoryContent(githubToken, owner, repo, expression) {
+async function fetchRepositoryContent(githubToken: string, owner: string, repo: string, expression: string) {
   try {
-    if (!githubToken) {
-      throw new Error('Token is Not Found')
-    }
-
-    const { repository } = await graphql(`
+    const { repository } = await graphql<Content>(`
         query content($owner: String!, $repo: String!, $expression: String!) {
           repository(owner: $owner, name: $repo) {
             object(expression: $expression) {
               ... on Blob {
                 text
               }
-              # ... on Tree {
-              #   entries {
-              #     name
-              #     object {
-              #       ... on Blob {
-              #         text
-              #       }
-              #     }
-              #   }
-              # }
             }
           }
         }
@@ -84,9 +77,9 @@ async function fetchRepositoryContent(githubToken, owner, repo, expression) {
   }
 
   const repository = await fetchRepositoryContent(token, owner, repositoryName, repositoryExpression)
-  /** @type import("@octokit/graphql-schema").Blob */
-  const { text } = repository.object;
-  
+  if(!repository) return;
+
+  const { text } = repository.object
   const replacedMd = text
     .replace('{{ age }}', getAge('1993-09-11').toString())
     .replace('{{ date }}', format(new Date(), 'yyyy年MM月dd日'))

script/getFeed.mjs renamed to script/getFeed.mts

@@ -1,22 +1,30 @@
 import { graphql, GraphqlResponseError } from '@octokit/graphql'
 import { subYears, startOfWeek, format } from 'date-fns'
 import fs from "node:fs"
+import type { PinnedItem, ContributionCalendar } from '@/types/github';
+
+type UserContent = {
+  user: {
+    pinnedItems: {
+      nodes: PinnedItem[]
+    };
+    contributionsCollection: {
+      contributionCalendar: ContributionCalendar;
+    };
+  };
+};
 
 /**
- * @param {string} githubToken
- * @param {string} owner userid
- * @param {number} pinnedItemsNum
- * @param {string} calendarFrom new Date().toISOString().split(".")[0]
- * @param {string} calendarTo "2023-04-01T00:00:00"
- * @returns {import("@octokit/graphql-schema").User}
+ * @param githubToken
+ * @param owner userid
+ * @param pinnedItemsNum
+ * @param calendarFrom new Date().toISOString().split(".")[0]
+ * @param calendarTo "2023-04-01T00:00:00"
+ * @returns
  */
-async function fetchUserContent(githubToken, owner, pinnedItemsNum, calendarFrom, calendarTo,) {
+async function fetchUserContent(githubToken: string, owner: string, pinnedItemsNum: number, calendarFrom: string, calendarTo: string) {
   try {
-    if (!githubToken) {
-      throw new Error('githubToken is not defined')
-    }
-
-    const { user } = await graphql(`
+    const { user } = await graphql<UserContent>(`
         query userContent($owner: String!, $pinnedItemsNum: Int = 4, $calendarFrom: DateTime!, $calendarTo: DateTime!) {
           user(login: $owner) {
             pinnedItems(first: $pinnedItemsNum) {
@@ -38,7 +46,6 @@ async function fetchUserContent(githubToken, owner, pinnedItemsNum, calendarFrom
             contributionsCollection(from: $calendarFrom, to: $calendarTo) {
               contributionCalendar {
                 totalContributions
-                isHalloween
                 weeks {
                   firstDay
                   contributionDays {
@@ -79,12 +86,11 @@ async function fetchUserContent(githubToken, owner, pinnedItemsNum, calendarFrom
 
 ;(async () => {
   const token = process.env.SECRET_GH_PAT || "";
-  const owner = "oriverk"
-
   if (!token) {
     return console.log('Env is Not Found.')
   }
 
+  const owner = "oriverk"
   const lastYear = subYears(new Date(), 1)
   const start = startOfWeek(lastYear, { weekStartsOn: 0 })
   const from = `${format(start, 'yyyy-MM-dd')}T00:00:00`
@@ -96,14 +102,22 @@ async function fetchUserContent(githubToken, owner, pinnedItemsNum, calendarFrom
     return;
   }
 
-  /** @type {import("@octokit/graphql-schema").User} */
   const { pinnedItems, contributionsCollection } = user
   if (!fs.existsSync(".contents")) {
     fs.mkdirSync(".contents");
   }
+
+  const repositories = []
+  for (const {url, ...rest} of pinnedItems.nodes) {
+    repositories.push({
+      id: url,
+      url,
+      ...rest
+    })
+  }
   fs.writeFileSync(
     ".contents/repository.json",
-    JSON.stringify(pinnedItems.nodes || [], null, 2)
+    JSON.stringify(repositories, null, 2)
   );
   fs.writeFileSync(
     ".contents/contributions.json",