From 0c253dc46aea5ca46aab02c1d59f06680557c4e6 Mon Sep 17 00:00:00 2001 From: Mo Date: Fri, 18 Nov 2022 05:51:08 -0600 Subject: [PATCH] chore: make models package public for consumption by server --- .../Subscription/SubscriptionApiService.spec.ts | 2 +- .../src/Domain/Client/User/UserApiService.spec.ts | 2 +- .../api/src/Domain/Client/User/UserApiService.ts | 2 +- .../Domain/Client/User/UserApiServiceInterface.ts | 2 +- .../SubscriptionInviteListResponseBody.ts | 2 +- .../Server/Subscription/SubscriptionServer.spec.ts | 2 +- packages/models/package.json | 13 ++++++++++--- packages/models/tsconfig.json | 2 +- 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/packages/api/src/Domain/Client/Subscription/SubscriptionApiService.spec.ts b/packages/api/src/Domain/Client/Subscription/SubscriptionApiService.spec.ts index 08127ec27..c729ee92b 100644 --- a/packages/api/src/Domain/Client/Subscription/SubscriptionApiService.spec.ts +++ b/packages/api/src/Domain/Client/Subscription/SubscriptionApiService.spec.ts @@ -1,4 +1,4 @@ -import { Invitation } from '@standardnotes/models' +import { type Invitation } from '@standardnotes/models' import { SubscriptionInviteAcceptResponse } from '../../Response/Subscription/SubscriptionInviteAcceptResponse' import { SubscriptionInviteCancelResponse } from '../../Response/Subscription/SubscriptionInviteCancelResponse' diff --git a/packages/api/src/Domain/Client/User/UserApiService.spec.ts b/packages/api/src/Domain/Client/User/UserApiService.spec.ts index 4dfdc2074..670ef15ba 100644 --- a/packages/api/src/Domain/Client/User/UserApiService.spec.ts +++ b/packages/api/src/Domain/Client/User/UserApiService.spec.ts @@ -1,5 +1,5 @@ import { ProtocolVersion, UserRequestType } from '@standardnotes/common' -import { RootKeyParamsInterface } from '@standardnotes/models' +import { type RootKeyParamsInterface } from '@standardnotes/models' import { UserDeletionResponse } from '../../Response/User/UserDeletionResponse' import { UserRegistrationResponse } from '../../Response/User/UserRegistrationResponse' diff --git a/packages/api/src/Domain/Client/User/UserApiService.ts b/packages/api/src/Domain/Client/User/UserApiService.ts index 7e66daedf..351b1d79a 100644 --- a/packages/api/src/Domain/Client/User/UserApiService.ts +++ b/packages/api/src/Domain/Client/User/UserApiService.ts @@ -1,4 +1,4 @@ -import { RootKeyParamsInterface } from '@standardnotes/models' +import { type RootKeyParamsInterface } from '@standardnotes/models' import { UserRequestType } from '@standardnotes/common' import { ErrorMessage } from '../../Error/ErrorMessage' diff --git a/packages/api/src/Domain/Client/User/UserApiServiceInterface.ts b/packages/api/src/Domain/Client/User/UserApiServiceInterface.ts index 952ea89ee..81d4d2d19 100644 --- a/packages/api/src/Domain/Client/User/UserApiServiceInterface.ts +++ b/packages/api/src/Domain/Client/User/UserApiServiceInterface.ts @@ -1,5 +1,5 @@ import { UserRequestType, Uuid } from '@standardnotes/common' -import { RootKeyParamsInterface } from '@standardnotes/models' +import { type RootKeyParamsInterface } from '@standardnotes/models' import { UserDeletionResponse } from '../../Response/User/UserDeletionResponse' import { UserRegistrationResponse } from '../../Response/User/UserRegistrationResponse' diff --git a/packages/api/src/Domain/Response/Subscription/SubscriptionInviteListResponseBody.ts b/packages/api/src/Domain/Response/Subscription/SubscriptionInviteListResponseBody.ts index 698b7dcf1..e09457683 100644 --- a/packages/api/src/Domain/Response/Subscription/SubscriptionInviteListResponseBody.ts +++ b/packages/api/src/Domain/Response/Subscription/SubscriptionInviteListResponseBody.ts @@ -1,4 +1,4 @@ -import { Invitation } from '@standardnotes/models' +import { type Invitation } from '@standardnotes/models' export type SubscriptionInviteListResponseBody = { invitations: Array diff --git a/packages/api/src/Domain/Server/Subscription/SubscriptionServer.spec.ts b/packages/api/src/Domain/Server/Subscription/SubscriptionServer.spec.ts index 6867e0633..3af42cfa7 100644 --- a/packages/api/src/Domain/Server/Subscription/SubscriptionServer.spec.ts +++ b/packages/api/src/Domain/Server/Subscription/SubscriptionServer.spec.ts @@ -1,4 +1,4 @@ -import { Invitation } from '@standardnotes/models' +import { type Invitation } from '@standardnotes/models' import { ApiVersion } from '../../Api' import { HttpServiceInterface } from '../../Http' diff --git a/packages/models/package.json b/packages/models/package.json index 36bbbabf6..1700dcd7f 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -4,13 +4,20 @@ "engines": { "node": ">=16.0.0 <17.0.0" }, - "private": true, + "publishConfig": { + "access": "public" + }, "description": "Models used in SNJS library", "author": "Standard Notes", - "main": "./src/index.ts", + "main": "./dist/index.js", + "types": "./dist/index.d.ts", "license": "AGPL-3.0-or-later", "scripts": { - "tsc": "tsc -p tsconfig.json", + "clean": "rm -fr dist", + "prestart": "yarn clean", + "start": "tsc -p tsconfig.json --watch", + "prebuild": "yarn clean", + "build": "tsc -p tsconfig.json", "lint": "eslint src --ext .ts", "test": "jest" }, diff --git a/packages/models/tsconfig.json b/packages/models/tsconfig.json index 12eec31dd..358e5730e 100644 --- a/packages/models/tsconfig.json +++ b/packages/models/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../UILib.tsconfig.json", + "extends": "../../node_modules/@standardnotes/config/src/tsconfig.json", "compilerOptions": { "skipLibCheck": true, "rootDir": "./src",