@looma/prisma-cli 0.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +39 -0
- package/dist/adapters/config.js +74 -0
- package/dist/adapters/local-state.js +98 -0
- package/dist/adapters/mock-api.js +57 -0
- package/dist/adapters/token-storage.js +43 -0
- package/dist/cli.js +9 -0
- package/dist/cli2.js +59 -0
- package/dist/commands/app/index.js +178 -0
- package/dist/commands/auth/index.js +42 -0
- package/dist/commands/env/index.js +51 -0
- package/dist/commands/project/index.js +45 -0
- package/dist/controllers/app.js +658 -0
- package/dist/controllers/auth.js +107 -0
- package/dist/controllers/env.js +73 -0
- package/dist/controllers/project.js +214 -0
- package/dist/controllers/select-prompt-port.js +12 -0
- package/dist/lib/app/local-dev.js +178 -0
- package/dist/lib/app/prototype-build.js +109 -0
- package/dist/lib/app/prototype-interaction.js +38 -0
- package/dist/lib/app/prototype-progress.js +115 -0
- package/dist/lib/app/prototype-provider.js +163 -0
- package/dist/lib/auth/auth-ops.js +57 -0
- package/dist/lib/auth/client.js +22 -0
- package/dist/lib/auth/guard.js +34 -0
- package/dist/lib/auth/login.js +117 -0
- package/dist/output/patterns.js +93 -0
- package/dist/presenters/app.js +333 -0
- package/dist/presenters/auth.js +73 -0
- package/dist/presenters/env.js +111 -0
- package/dist/presenters/project.js +84 -0
- package/dist/shell/command-meta.js +294 -0
- package/dist/shell/command-runner.js +33 -0
- package/dist/shell/errors.js +64 -0
- package/dist/shell/global-flags.js +25 -0
- package/dist/shell/help.js +78 -0
- package/dist/shell/output.js +48 -0
- package/dist/shell/prompt.js +31 -0
- package/dist/shell/runtime.js +51 -0
- package/dist/shell/ui.js +59 -0
- package/dist/use-cases/auth.js +70 -0
- package/dist/use-cases/create-cli-gateways.js +93 -0
- package/dist/use-cases/env.js +104 -0
- package/dist/use-cases/project.js +75 -0
- package/package.json +30 -0
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { usageError } from "../shell/errors.js";
|
|
2
|
+
//#region src/use-cases/auth.ts
|
|
3
|
+
function createAuthUseCases(dependencies) {
|
|
4
|
+
return {
|
|
5
|
+
whoami: () => resolveCurrentAuthState(dependencies),
|
|
6
|
+
login: async (selection) => {
|
|
7
|
+
await dependencies.sessionGateway.writeAuthSession({
|
|
8
|
+
provider: selection.provider,
|
|
9
|
+
userId: selection.userId,
|
|
10
|
+
workspaceId: selection.workspaceId
|
|
11
|
+
});
|
|
12
|
+
return resolveCurrentAuthState(dependencies);
|
|
13
|
+
},
|
|
14
|
+
logout: async () => {
|
|
15
|
+
await dependencies.sessionGateway.clearAuthSession();
|
|
16
|
+
return resolveCurrentAuthState(dependencies);
|
|
17
|
+
},
|
|
18
|
+
listProviders: async () => dependencies.identityGateway.listProviders(),
|
|
19
|
+
resolveProvider: async (providerId) => {
|
|
20
|
+
const provider = dependencies.identityGateway.getProvider(providerId);
|
|
21
|
+
if (!provider) throw usageError("Login requires a valid mock provider", `The mock provider "${providerId}" does not exist.`, "Use --provider github or --provider google.", ["prisma auth login"], "auth");
|
|
22
|
+
return provider;
|
|
23
|
+
},
|
|
24
|
+
listUsersForProvider: async (providerId) => {
|
|
25
|
+
const users = dependencies.identityGateway.listUsersForProvider(providerId);
|
|
26
|
+
if (users.length === 0) throw usageError("Login requires a valid mock user", `No mock users support provider "${providerId}".`, "Update the fixture data or choose a different provider.", ["prisma auth login"], "auth");
|
|
27
|
+
return users;
|
|
28
|
+
},
|
|
29
|
+
resolveUserForProvider: async (providerId, userId) => {
|
|
30
|
+
const user = dependencies.identityGateway.getUserForProvider(providerId, userId);
|
|
31
|
+
if (!user) throw usageError("Login requires a valid mock user", `The mock user "${userId}" is not available for provider "${providerId}".`, "Choose a user that supports the selected provider.", ["prisma auth login"], "auth");
|
|
32
|
+
return user;
|
|
33
|
+
},
|
|
34
|
+
listWorkspacesForUser: async (userId) => dependencies.identityGateway.listUserWorkspaces(userId),
|
|
35
|
+
resolveWorkspaceForUser: async (userId, workspaceId) => {
|
|
36
|
+
const workspace = dependencies.identityGateway.getUserWorkspace(userId, workspaceId);
|
|
37
|
+
if (!workspace) throw usageError("Login requires a valid mock workspace", `The mock workspace "${workspaceId}" is not available for the selected user.`, "Choose a workspace that the selected user can access.", ["prisma auth login"], "auth");
|
|
38
|
+
return workspace;
|
|
39
|
+
}
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
async function resolveCurrentAuthState(dependencies) {
|
|
43
|
+
const [session, linkedProjectId] = await Promise.all([dependencies.sessionGateway.readAuthSession(), dependencies.projectConfigGateway.readLinkedProjectId()]);
|
|
44
|
+
if (!session) return {
|
|
45
|
+
authenticated: false,
|
|
46
|
+
provider: null,
|
|
47
|
+
user: null,
|
|
48
|
+
workspace: null,
|
|
49
|
+
linkedProjectId
|
|
50
|
+
};
|
|
51
|
+
const provider = dependencies.identityGateway.getProvider(session.provider);
|
|
52
|
+
const user = dependencies.identityGateway.getUser(session.userId);
|
|
53
|
+
const workspace = dependencies.identityGateway.getWorkspace(session.workspaceId);
|
|
54
|
+
if (!provider || !user || !workspace) return {
|
|
55
|
+
authenticated: false,
|
|
56
|
+
provider: null,
|
|
57
|
+
user: null,
|
|
58
|
+
workspace: null,
|
|
59
|
+
linkedProjectId
|
|
60
|
+
};
|
|
61
|
+
return {
|
|
62
|
+
authenticated: true,
|
|
63
|
+
provider: provider.id,
|
|
64
|
+
user,
|
|
65
|
+
workspace,
|
|
66
|
+
linkedProjectId
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
//#endregion
|
|
70
|
+
export { createAuthUseCases };
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { UnsafeConfigWriteError, readLinkedProjectId, writeLinkedProjectId } from "../adapters/config.js";
|
|
2
|
+
import { usageError } from "../shell/errors.js";
|
|
3
|
+
//#region src/use-cases/create-cli-gateways.ts
|
|
4
|
+
function createCliUseCaseGateways(context) {
|
|
5
|
+
return {
|
|
6
|
+
identityGateway: {
|
|
7
|
+
listProviders: () => context.api.listProviders(),
|
|
8
|
+
getProvider: (providerId) => context.api.getProvider(providerId),
|
|
9
|
+
listUsersForProvider: (providerId) => context.api.listUsersForProvider(providerId).map(toAuthUser),
|
|
10
|
+
getUser: (userId) => {
|
|
11
|
+
const user = context.api.getUser(userId);
|
|
12
|
+
return user ? toAuthUser(user) : void 0;
|
|
13
|
+
},
|
|
14
|
+
getUserForProvider: (providerId, userId) => {
|
|
15
|
+
const user = context.api.getUserForProvider(providerId, userId);
|
|
16
|
+
return user ? toAuthUser(user) : void 0;
|
|
17
|
+
},
|
|
18
|
+
listUserWorkspaces: (userId) => context.api.listUserWorkspaces(userId).map(toAuthWorkspace),
|
|
19
|
+
getWorkspace: (workspaceId) => {
|
|
20
|
+
const workspace = context.api.getWorkspace(workspaceId);
|
|
21
|
+
return workspace ? toAuthWorkspace(workspace) : void 0;
|
|
22
|
+
},
|
|
23
|
+
getUserWorkspace: (userId, workspaceId) => {
|
|
24
|
+
const workspace = context.api.getUserWorkspace(userId, workspaceId);
|
|
25
|
+
return workspace ? toAuthWorkspace(workspace) : void 0;
|
|
26
|
+
}
|
|
27
|
+
},
|
|
28
|
+
projectGateway: {
|
|
29
|
+
listProjectsForWorkspace: (workspaceId) => context.api.listProjectsForWorkspace(workspaceId),
|
|
30
|
+
getProject: (projectId) => context.api.getProject(projectId),
|
|
31
|
+
getProjectForWorkspace: (workspaceId, projectId) => context.api.getProjectForWorkspace(workspaceId, projectId)
|
|
32
|
+
},
|
|
33
|
+
environmentGateway: {
|
|
34
|
+
listEnvironmentsForProject: (projectId) => context.api.listEnvironmentsForProject(projectId).map((environment) => ({
|
|
35
|
+
...environment,
|
|
36
|
+
kind: environment.name === "production" ? "production" : "preview"
|
|
37
|
+
})),
|
|
38
|
+
getEnvironmentForProject: (projectId, name) => {
|
|
39
|
+
const environment = context.api.getEnvironmentForProject(projectId, name);
|
|
40
|
+
return environment ? {
|
|
41
|
+
...environment,
|
|
42
|
+
kind: environment.name === "production" ? "production" : "preview"
|
|
43
|
+
} : void 0;
|
|
44
|
+
},
|
|
45
|
+
getDeployment: (deploymentId) => context.api.getDeployment(deploymentId)
|
|
46
|
+
},
|
|
47
|
+
projectConfigGateway: {
|
|
48
|
+
readLinkedProjectId: () => readLinkedProjectId(context.runtime.cwd),
|
|
49
|
+
writeLinkedProjectId: async (projectId) => {
|
|
50
|
+
try {
|
|
51
|
+
await writeLinkedProjectId(context.runtime.cwd, projectId);
|
|
52
|
+
} catch (error) {
|
|
53
|
+
if (error instanceof UnsafeConfigWriteError) throw usageError("Project link requires a writable Prisma config", error.message, "Update prisma.config.ts to use a recognizable project field, or remove it and rerun prisma project link.", ["prisma project link proj_123"], "project");
|
|
54
|
+
throw error;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
},
|
|
58
|
+
sessionGateway: {
|
|
59
|
+
readAuthSession: async () => {
|
|
60
|
+
return (await context.stateStore.read()).auth;
|
|
61
|
+
},
|
|
62
|
+
writeAuthSession: async (session) => {
|
|
63
|
+
await context.stateStore.setAuthSession(session);
|
|
64
|
+
},
|
|
65
|
+
clearAuthSession: async () => {
|
|
66
|
+
await context.stateStore.clearAuthSession();
|
|
67
|
+
}
|
|
68
|
+
},
|
|
69
|
+
environmentStateGateway: {
|
|
70
|
+
readActiveEnvironment: async () => {
|
|
71
|
+
return (await context.stateStore.read()).environment.active;
|
|
72
|
+
},
|
|
73
|
+
writeActiveEnvironment: async (environmentName) => {
|
|
74
|
+
await context.stateStore.setActiveEnvironment(environmentName);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
function toAuthUser(user) {
|
|
80
|
+
return {
|
|
81
|
+
id: user.id,
|
|
82
|
+
name: user.name,
|
|
83
|
+
email: user.email
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
function toAuthWorkspace(workspace) {
|
|
87
|
+
return {
|
|
88
|
+
id: workspace.id,
|
|
89
|
+
name: workspace.name
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
//#endregion
|
|
93
|
+
export { createCliUseCaseGateways };
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
//#region src/use-cases/env.ts
|
|
2
|
+
function createEnvUseCases(dependencies) {
|
|
3
|
+
return {
|
|
4
|
+
list: async () => {
|
|
5
|
+
const [linkedProjectId, activeEnvironment] = await Promise.all([dependencies.projectConfigGateway.readLinkedProjectId(), dependencies.environmentStateGateway.readActiveEnvironment()]);
|
|
6
|
+
const remoteEnvironments = await listRemoteEnvironments(dependencies.environmentGateway, linkedProjectId);
|
|
7
|
+
return {
|
|
8
|
+
linkedProjectId,
|
|
9
|
+
projectName: resolveProjectName(dependencies.projectGateway, linkedProjectId),
|
|
10
|
+
activeEnvironment,
|
|
11
|
+
environments: buildEnvironmentSummaries(linkedProjectId, activeEnvironment, remoteEnvironments)
|
|
12
|
+
};
|
|
13
|
+
},
|
|
14
|
+
show: async () => {
|
|
15
|
+
const [linkedProjectId, activeEnvironment] = await Promise.all([dependencies.projectConfigGateway.readLinkedProjectId(), dependencies.environmentStateGateway.readActiveEnvironment()]);
|
|
16
|
+
return {
|
|
17
|
+
linkedProjectId,
|
|
18
|
+
projectName: resolveProjectName(dependencies.projectGateway, linkedProjectId),
|
|
19
|
+
environment: buildEnvironmentDetail(dependencies.environmentGateway, linkedProjectId, activeEnvironment)
|
|
20
|
+
};
|
|
21
|
+
},
|
|
22
|
+
use: async (environmentName) => {
|
|
23
|
+
await dependencies.environmentStateGateway.writeActiveEnvironment(environmentName);
|
|
24
|
+
const linkedProjectId = await dependencies.projectConfigGateway.readLinkedProjectId();
|
|
25
|
+
return {
|
|
26
|
+
linkedProjectId,
|
|
27
|
+
projectName: resolveProjectName(dependencies.projectGateway, linkedProjectId),
|
|
28
|
+
environment: buildEnvironmentDetail(dependencies.environmentGateway, linkedProjectId, environmentName)
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
function resolveProjectName(projectGateway, linkedProjectId) {
|
|
34
|
+
if (!linkedProjectId) return null;
|
|
35
|
+
return projectGateway.getProject(linkedProjectId)?.name ?? null;
|
|
36
|
+
}
|
|
37
|
+
async function listRemoteEnvironments(environmentGateway, linkedProjectId) {
|
|
38
|
+
if (!linkedProjectId) return [];
|
|
39
|
+
return environmentGateway.listEnvironmentsForProject(linkedProjectId);
|
|
40
|
+
}
|
|
41
|
+
function buildEnvironmentSummaries(linkedProjectId, activeEnvironment, remoteEnvironments) {
|
|
42
|
+
const byName = /* @__PURE__ */ new Map();
|
|
43
|
+
byName.set("local", {
|
|
44
|
+
id: "local",
|
|
45
|
+
name: "local",
|
|
46
|
+
kind: "local",
|
|
47
|
+
active: activeEnvironment === "local",
|
|
48
|
+
remoteState: false
|
|
49
|
+
});
|
|
50
|
+
for (const environment of remoteEnvironments) byName.set(environment.name, {
|
|
51
|
+
id: environment.id,
|
|
52
|
+
name: environment.name,
|
|
53
|
+
kind: environment.kind,
|
|
54
|
+
active: activeEnvironment === environment.name,
|
|
55
|
+
remoteState: true
|
|
56
|
+
});
|
|
57
|
+
if (!byName.has(activeEnvironment) && activeEnvironment !== "local") byName.set(activeEnvironment, {
|
|
58
|
+
id: activeEnvironment,
|
|
59
|
+
name: activeEnvironment,
|
|
60
|
+
kind: toEnvironmentKind(activeEnvironment),
|
|
61
|
+
active: true,
|
|
62
|
+
remoteState: false
|
|
63
|
+
});
|
|
64
|
+
return sortEnvironments([...byName.values()]);
|
|
65
|
+
}
|
|
66
|
+
function buildEnvironmentDetail(environmentGateway, linkedProjectId, environmentName) {
|
|
67
|
+
const kind = toEnvironmentKind(environmentName);
|
|
68
|
+
const remoteEnvironment = linkedProjectId && kind !== "local" ? environmentGateway.getEnvironmentForProject(linkedProjectId, environmentName) : void 0;
|
|
69
|
+
return {
|
|
70
|
+
name: environmentName,
|
|
71
|
+
kind,
|
|
72
|
+
active: true,
|
|
73
|
+
remoteState: Boolean(remoteEnvironment),
|
|
74
|
+
liveDeployment: remoteEnvironment && remoteEnvironment.currentDeploymentId ? toLiveDeployment(environmentGateway.getDeployment(remoteEnvironment.currentDeploymentId)) : null
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
function toEnvironmentKind(name) {
|
|
78
|
+
if (name === "local") return "local";
|
|
79
|
+
if (name === "production") return "production";
|
|
80
|
+
return "preview";
|
|
81
|
+
}
|
|
82
|
+
function sortEnvironments(environments) {
|
|
83
|
+
return environments.slice().sort((left, right) => {
|
|
84
|
+
const leftRank = environmentOrder(left);
|
|
85
|
+
const rightRank = environmentOrder(right);
|
|
86
|
+
if (leftRank !== rightRank) return leftRank - rightRank;
|
|
87
|
+
return left.name.localeCompare(right.name);
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
function environmentOrder(environment) {
|
|
91
|
+
if (environment.name === "local") return 0;
|
|
92
|
+
if (environment.name === "production") return 1;
|
|
93
|
+
return 2;
|
|
94
|
+
}
|
|
95
|
+
function toLiveDeployment(deployment) {
|
|
96
|
+
if (!deployment) return null;
|
|
97
|
+
return {
|
|
98
|
+
id: deployment.id,
|
|
99
|
+
status: deployment.status,
|
|
100
|
+
url: deployment.url
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
//#endregion
|
|
104
|
+
export { createEnvUseCases };
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import { CliError, authRequiredError } from "../shell/errors.js";
|
|
2
|
+
//#region src/use-cases/project.ts
|
|
3
|
+
function createProjectUseCases(dependencies) {
|
|
4
|
+
return {
|
|
5
|
+
list: async (authState) => {
|
|
6
|
+
const workspace = requireWorkspace(authState);
|
|
7
|
+
return {
|
|
8
|
+
workspace,
|
|
9
|
+
linkedProjectId: authState.linkedProjectId,
|
|
10
|
+
projects: listSortedWorkspaceProjects(dependencies.projectGateway, workspace.id).map(toProjectSummary)
|
|
11
|
+
};
|
|
12
|
+
},
|
|
13
|
+
show: async (authState) => {
|
|
14
|
+
if (!authState.linkedProjectId) return {
|
|
15
|
+
linkedProjectId: null,
|
|
16
|
+
workspace: null,
|
|
17
|
+
project: null
|
|
18
|
+
};
|
|
19
|
+
if (!authState.authenticated || !authState.workspace) return {
|
|
20
|
+
linkedProjectId: authState.linkedProjectId,
|
|
21
|
+
workspace: null,
|
|
22
|
+
project: null
|
|
23
|
+
};
|
|
24
|
+
const project = dependencies.projectGateway.getProjectForWorkspace(authState.workspace.id, authState.linkedProjectId);
|
|
25
|
+
if (!project) return {
|
|
26
|
+
linkedProjectId: authState.linkedProjectId,
|
|
27
|
+
workspace: null,
|
|
28
|
+
project: null
|
|
29
|
+
};
|
|
30
|
+
return {
|
|
31
|
+
linkedProjectId: authState.linkedProjectId,
|
|
32
|
+
workspace: authState.workspace,
|
|
33
|
+
project: toProjectSummary(project)
|
|
34
|
+
};
|
|
35
|
+
},
|
|
36
|
+
link: async (authState, projectId) => {
|
|
37
|
+
const workspace = requireWorkspace(authState);
|
|
38
|
+
const project = dependencies.projectGateway.getProjectForWorkspace(workspace.id, projectId);
|
|
39
|
+
if (!project) throw projectNotFoundError(`The project "${projectId}" does not exist in workspace "${workspace.name}".`, "Run prisma project list and choose a project id from the active workspace.");
|
|
40
|
+
await dependencies.projectConfigGateway.writeLinkedProjectId(project.id);
|
|
41
|
+
return {
|
|
42
|
+
linkedProjectId: project.id,
|
|
43
|
+
workspace,
|
|
44
|
+
project: toProjectSummary(project)
|
|
45
|
+
};
|
|
46
|
+
},
|
|
47
|
+
listProjectsForWorkspace: async (workspaceId) => listSortedWorkspaceProjects(dependencies.projectGateway, workspaceId).map(toProjectSummary)
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
function requireWorkspace(authState) {
|
|
51
|
+
if (!authState.authenticated || !authState.workspace) throw authRequiredError();
|
|
52
|
+
return authState.workspace;
|
|
53
|
+
}
|
|
54
|
+
function listSortedWorkspaceProjects(projectGateway, workspaceId) {
|
|
55
|
+
return projectGateway.listProjectsForWorkspace(workspaceId).slice().sort((left, right) => left.name.localeCompare(right.name) || left.id.localeCompare(right.id));
|
|
56
|
+
}
|
|
57
|
+
function toProjectSummary(project) {
|
|
58
|
+
return {
|
|
59
|
+
id: project.id,
|
|
60
|
+
name: project.name
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
function projectNotFoundError(why, fix, nextSteps = ["prisma project list"]) {
|
|
64
|
+
return new CliError({
|
|
65
|
+
code: "PROJECT_NOT_FOUND",
|
|
66
|
+
domain: "project",
|
|
67
|
+
summary: "Project not found",
|
|
68
|
+
why,
|
|
69
|
+
fix,
|
|
70
|
+
exitCode: 1,
|
|
71
|
+
nextSteps
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
//#endregion
|
|
75
|
+
export { createProjectUseCases, projectNotFoundError };
|
package/package.json
ADDED
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@looma/prisma-cli",
|
|
3
|
+
"version": "0.1.1",
|
|
4
|
+
"description": "Prototype Prisma Compute CLI.",
|
|
5
|
+
"type": "module",
|
|
6
|
+
"bin": {
|
|
7
|
+
"prisma-cli": "./dist/cli.js"
|
|
8
|
+
},
|
|
9
|
+
"files": [
|
|
10
|
+
"dist",
|
|
11
|
+
"README.md"
|
|
12
|
+
],
|
|
13
|
+
"publishConfig": {
|
|
14
|
+
"access": "public"
|
|
15
|
+
},
|
|
16
|
+
"dependencies": {
|
|
17
|
+
"@clack/prompts": "^1.2.0",
|
|
18
|
+
"@prisma/compute-sdk": "^0.11.0",
|
|
19
|
+
"c12": "4.0.0-beta.4",
|
|
20
|
+
"@prisma/credentials-store": "^7.7.0",
|
|
21
|
+
"@prisma/management-api-sdk": "^1.23.0",
|
|
22
|
+
"colorette": "^2.0.20",
|
|
23
|
+
"commander": "^12.1.0",
|
|
24
|
+
"magicast": "^0.3.5",
|
|
25
|
+
"open": "^11.0.0",
|
|
26
|
+
"string-width": "^8.2.0",
|
|
27
|
+
"strip-ansi": "^7.2.0",
|
|
28
|
+
"wrap-ansi": "^10.0.0"
|
|
29
|
+
}
|
|
30
|
+
}
|