fix: Add package.json for proto

strideynet · Aug 15, 2023 · c6190e2 · c6190e2
1 parent b874c58
commit c6190e2
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 39 deletions.
diff --git a/web/info/src/lib/api.ts b/web/info/src/lib/api.ts
@@ -1,34 +1,8 @@
+import { PublicService } from '$api/public_service_connectweb';
 import { API_URL } from '$lib/constants';
 
 import { createPromiseClient } from '@bufbuild/connect';
 import { createConnectTransport } from '@bufbuild/connect-web';
-import { MethodKind, proto3 } from '@bufbuild/protobuf';
-
-const ListFeedsRequest = proto3.makeMessageType('bff.v1.ListFeedsRequest', []);
-
-const ListFeedsResponse = proto3.makeMessageType('bff.v1.ListFeedsResponse', () => [
-  { no: 1, name: 'feeds', kind: 'message', T: Feed, repeated: true }
-]);
-
-const Feed = proto3.makeMessageType('bff.v1.Feed', () => [
-  { no: 1, name: 'id', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
-  { no: 2, name: 'link', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
-  { no: 3, name: 'display_name', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
-  { no: 4, name: 'description', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
-  { no: 5, name: 'priority', kind: 'scalar', T: 5 /* ScalarType.INT32 */ }
-]);
-
-const PublicService = {
-  typeName: 'bff.v1.PublicService',
-  methods: {
-    listFeeds: {
-      name: 'ListFeeds',
-      I: ListFeedsRequest,
-      O: ListFeedsResponse,
-      kind: MethodKind.Unary
-    }
-  }
-};
 
 type RouteFetch = typeof fetch;
 

diff --git a/web/info/src/routes/+layout.ts b/web/info/src/routes/+layout.ts
@@ -21,7 +21,8 @@ export const load = (async ({ url, fetch }) => {
   const apiClient = getClient(fetch);
 
   (feeds ||=
-    (await (apiClient.listFeeds as () => Promise<{ feeds: FeedInfo[] }>)()
+    (await apiClient
+      .listFeeds({})
       .then((res) => {
         return res.feeds
           .filter((f) => f.priority >= 0)

diff --git a/web/info/svelte.config.js b/web/info/svelte.config.js
@@ -14,6 +14,7 @@ const config = {
 
   kit: {
     alias: {
+      $api: '../proto/bff/v1',
       $components: 'src/components',
       $stores: 'src/stores',
       $routes: 'src/routes'

diff --git a/web/info/tsconfig.json b/web/info/tsconfig.json
@@ -10,6 +10,7 @@
     "sourceMap": true,
     "strict": true,
     "paths": {
+      "$api/*": ["../proto/bff/v1/*"],
       "$lib": ["src/lib"],
       "$lib/*": ["src/lib/*"],
       "$components/*": ["src/components/*"],

diff --git a/web/info/types/app/index.ts b/web/info/types/app/index.ts
@@ -1,10 +1 @@
-type FeedInfo = {
-  id: string;
-  displayName: string;
-  description: string;
-  priority: number;
-  link: string;
-  tags?: string[];
-};
-
-export type { FeedInfo };
+export type { Feed as FeedInfo } from '$api/public_service_pb';
diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
diff --git a/web/pnpm-workspace.yaml b/web/pnpm-workspace.yaml
@@ -1,3 +1,4 @@
 packages:
   - 'admin'
   - 'info'
+  - 'proto'
diff --git a/web/proto/package.json b/web/proto/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "proto",
+  "version": "1.0.0",
+  "description": "",
+  "keywords": [],
+  "author": "",
+  "dependencies": {
+    "@bufbuild/protobuf": "~1.2.0"
+  }
+}