rm internal package

Rhys Sullivan committed 7 months ago

Commit dffd7041 parent c66deaa16 files · +11 −146Browse files

Unified · Split

16 files

apps/executor/package.json +0 −1
apps/executor/src/cli/main.ts +0 −4
apps/web/src/components/source-favicon.tsx +6 −15
bun.lock +1 −18
packages/platform/sdk/src/plugins.ts +0 −4
packages/platform/sdk/src/runtime/catalog/source/reconcile.ts +1 −5
packages/platform/sdk/src/runtime/catalog/source/sync.ts +1 −2
packages/platform/sdk/src/runtime/index.ts +0 −2
packages/platform/sdk/src/runtime/sources/source-plugins/index.ts +0 −4
packages/platform/sdk/src/schema/models/source-catalog.ts +1 −4
packages/platform/server/package.json +0 −1
packages/platform/server/src/index.ts +0 −2
packages/sources/core/src/source-models.ts +1 −4
plugins/internal/sdk/index.ts +0 −43
plugins/internal/sdk/package.json +0 −24
plugins/internal/sdk/tsconfig.json +0 −13

@@ -40,7 +40,6 @@ · 39 unmodified lines
40	40	"@executor/executor-mcp": "workspace:*",
41	41	"@executor/plugin-google-discovery-sdk": "workspace:*",
42	42	"@executor/plugin-graphql-sdk": "workspace:*",
43		− "@executor/plugin-internal-sdk": "workspace:*",
44	43	"@executor/plugin-mcp-sdk": "workspace:*",
45	44	"@executor/plugin-openapi-sdk": "workspace:*",
46	45	"@executor/platform-api": "workspace:*",

apps/executor/src/cli/main.ts+0−4

@@ -20,9 +20,6 @@ import { · 19 unmodified lines
20	20	import {
21	21	graphqlSdkPlugin,
22	22	} from "@executor/plugin-graphql-sdk";
23		−import {
24		− internalSdkPlugin,
25		−} from "@executor/plugin-internal-sdk";
26	23	import {
27	24	mcpSdkPlugin,
28	25	} from "@executor/plugin-mcp-sdk";
@@ -305,7 +302,6 @@ const loadRunWorkflowText = (): Effect.Effect<string, Error, never> => · 276 unmodified lines
305	302	localDataDir: DEFAULT_LOCAL_DATA_DIR,
306	303	}),
307	304	plugins: [
308		− internalSdkPlugin(),
309	305	graphqlSdkPlugin({
310	306	storage: createFileGraphqlSourceStorage({
311	307	rootDir: `${DEFAULT_LOCAL_DATA_DIR}/plugins/graphql/sources`,

apps/web/src/components/source-favicon.tsx+6−15

@@ -46,19 +46,10 @@ export function DefaultSourceIcon({ · 45 unmodified lines
46	46	}) {
47	47	const base = cn("shrink-0", className);
48	48
49		− switch (kind) {
50		− case "internal":
51		− return (
52		− <svg viewBox="0 0 16 16" fill="none" className={base}>
53		− <path d="M8 2v12M4 6l4-4 4 4M4 10l4 4 4-4" stroke="currentColor" strokeWidth="1.2" strokeLinecap="round" strokeLinejoin="round" />
54		− </svg>
55		− );
56		− default:
57		− return (
58		− <svg viewBox="0 0 16 16" fill="none" className={base}>
59		− <rect x="2.5" y="2.5" width="11" height="11" rx="2" stroke="currentColor" strokeWidth="1.2" />
60		− <path d="M5 6h6M5 8h4M5 10h3" stroke="currentColor" strokeWidth="1.1" strokeLinecap="round" />
61		− </svg>
62		− );
63		− }
	49	+ return (
	50	+ <svg viewBox="0 0 16 16" fill="none" className={base}>
	51	+ <rect x="2.5" y="2.5" width="11" height="11" rx="2" stroke="currentColor" strokeWidth="1.2" />
	52	+ <path d="M5 6h6M5 8h4M5 10h3" stroke="currentColor" strokeWidth="1.1" strokeLinecap="round" />
	53	+ </svg>
	54	+ );
64	55	}

bun.lock+1−18

@@ -18,7 +18,7 @@ · 17 unmodified lines
18	18	},
19	19	"apps/executor": {
20	20	"name": "executor",
21		− "version": "1.2.5",
	21	+ "version": "1.2.6",
22	22	"bin": {
23	23	"executor": "bin/executor",
24	24	},
@@ -33,7 +33,6 @@ · 8 unmodified lines
33	33	"@executor/platform-sdk-file": "workspace:*",
34	34	"@executor/plugin-google-discovery-sdk": "workspace:*",
35	35	"@executor/plugin-graphql-sdk": "workspace:*",
36		− "@executor/plugin-internal-sdk": "workspace:*",
37	36	"@executor/plugin-mcp-sdk": "workspace:*",
38	37	"@executor/plugin-openapi-sdk": "workspace:*",
39	38	"@executor/server": "workspace:*",
@@ -373,7 +372,6 @@ · 333 unmodified lines
373	372	"@executor/plugin-graphql-http": "workspace:*",
374	373	"@executor/plugin-graphql-sdk": "workspace:*",
375	374	"@executor/plugin-graphql-shared": "workspace:*",
376		− "@executor/plugin-internal-sdk": "workspace:*",
377	375	"@executor/plugin-mcp-http": "workspace:*",
378	376	"@executor/plugin-mcp-sdk": "workspace:*",
379	377	"@executor/plugin-mcp-shared": "workspace:*",
@@ -527,19 +525,6 @@ · 147 unmodified lines
527	525	"bun-types": "catalog:",
528	526	},
529	527	},
530		− "plugins/internal/sdk": {
531		− "name": "@executor/plugin-internal-sdk",
532		− "version": "0.0.0",
533		− "dependencies": {
534		− "@executor/platform-sdk": "workspace:*",
535		− "@executor/source-core": "workspace:*",
536		− "effect": "catalog:",
537		− },
538		− "devDependencies": {
539		− "@types/node": "catalog:",
540		− "bun-types": "catalog:",
541		− },
542		− },
543	528	"plugins/mcp/http": {
544	529	"name": "@executor/plugin-mcp-http",
545	530	"version": "0.0.0",
@@ -905,8 +890,6 @@ · 359 unmodified lines
905	890
906	891	"@executor/plugin-graphql-shared": ["@executor/plugin-graphql-shared@workspace:plugins/graphql/shared"],
907	892
908		− "@executor/plugin-internal-sdk": ["@executor/plugin-internal-sdk@workspace:plugins/internal/sdk"],
909		−
910	893	"@executor/plugin-mcp-http": ["@executor/plugin-mcp-http@workspace:plugins/mcp/http"],
911	894
912	895	"@executor/plugin-mcp-react": ["@executor/plugin-mcp-react@workspace:plugins/mcp/react"],

packages/platform/sdk/src/plugins.ts+0−4

@@ -131,9 +131,5 @@ export const registerExecutorSdkPlugins = ( · 130 unmodified lines
131	131	sourceConnectors: [...sourceConnectors.values()],
132	132	getSourcePlugin,
133	133	getSourcePluginForSource,
134		− sourcePluginCatalogKind: (kind: string): SourceCatalogKind =>
135		− getSourcePlugin(kind).catalogKind,
136		− isInternalSourcePluginKind: (kind: string): boolean =>
137		− getSourcePlugin(kind).catalogKind === "internal",
138	134	};
139	135	};

packages/platform/sdk/src/runtime/catalog/source/reconcile.ts+1−5

@@ -10,9 +10,6 @@ import { · 9 unmodified lines
10	10	import {
11	11	SourceArtifactStore,
12	12	} from "../../scope/storage";
13		−import {
14		− getSourcePluginForSource,
15		−} from "../../sources/source-plugins";
16	13	import {
17	14	RuntimeSourceStoreService,
18	15	} from "../../sources/source-store";
@@ -22,8 +19,7 @@ import { · 3 unmodified lines
22	19
23	20	const shouldReconcileSource = (source: Source): boolean =>
24	21	source.enabled
25		− && source.status === "connected"
26		− && getSourcePluginForSource(source).catalogKind !== "internal";
	22	+ && source.status === "connected";
27	23
28	24	export const reconcileMissingSourceCatalogArtifacts = (input: {
29	25	scopeId: ScopeId;

packages/platform/sdk/src/runtime/catalog/source/sync.ts+1−2

@@ -36,8 +36,7 @@ import { · 35 unmodified lines
36	36
37	37	const shouldIndexSource = (source: Source): boolean =>
38	38	source.enabled
39		− && source.status === "connected"
40		− && getSourcePluginForSource(source).catalogKind !== "internal";
	39	+ && source.status === "connected";
41	40
42	41	type RuntimeSourceCatalogSyncDeps = {
43	42	runtimeLocalScope: RuntimeLocalScopeState;

packages/platform/sdk/src/runtime/index.ts+0−2

@@ -119,8 +119,6 @@ export { · 118 unmodified lines
119	119	hasRegisteredExternalSourcePlugins,
120	120	getSourcePlugin,
121	121	getSourcePluginForSource,
122		− sourcePluginCatalogKind,
123		− isInternalSourcePluginKind,
124	122	} from "./sources/source-plugins";
125	123
126	124	export type ExecutorRuntimeOptions = {

packages/platform/sdk/src/runtime/sources/source-plugins/index.ts+0−4

@@ -24,10 +24,6 @@ export const getSourcePlugin = (kind: string) => registry.getSourcePlugin(kind); · 23 unmodified lines
24	24	export const getSourcePluginForSource = (
25	25	source: Parameters<typeof registry.getSourcePluginForSource>[0],
26	26	) => registry.getSourcePluginForSource(source);
27		−export const sourcePluginCatalogKind = (kind: string) =>
28		− registry.sourcePluginCatalogKind(kind);
29		−export const isInternalSourcePluginKind = (kind: string) =>
30		− registry.isInternalSourcePluginKind(kind);
31	27
32	28	export const hasRegisteredExternalSourcePlugins = () =>
33	29	configuredSourcePlugins.length > 0;

packages/platform/sdk/src/schema/models/source-catalog.ts+1−4

@@ -10,10 +10,7 @@ import { · 9 unmodified lines
10	10	SourceCatalogRevisionIdSchema,
11	11	} from "../ids";
12	12
13		−export const SourceCatalogKindSchema = Schema.Literal(
14		− "imported",
15		− "internal",
16		−);
	13	+export const SourceCatalogKindSchema = Schema.Literal("imported");
17	14
18	15	export const SourceCatalogPluginKeySchema = Schema.String;
19	16

packages/platform/server/package.json+0−1

@@ -15,7 +15,6 @@ · 14 unmodified lines
15	15	"@effect/platform": "catalog:",
16	16	"@effect/platform-node": "catalog:",
17	17	"@executor/executor-mcp": "workspace:*",
18		− "@executor/plugin-internal-sdk": "workspace:*",
19	18	"@executor/plugin-google-discovery-http": "workspace:*",
20	19	"@executor/plugin-google-discovery-shared": "workspace:*",
21	20	"@executor/plugin-google-discovery-sdk": "workspace:*",

packages/platform/server/src/index.ts+0−2

@@ -8,7 +8,6 @@ import { dirname, extname, resolve } from "node:path"; · 7 unmodified lines
8	8	import { Readable } from "node:stream";
9	9	import { FileSystem, HttpApiBuilder, HttpServer } from "@effect/platform";
10	10	import { NodeFileSystem } from "@effect/platform-node";
11		−import { internalSdkPlugin } from "@executor/plugin-internal-sdk";
12	11	import { googleDiscoveryHttpPlugin } from "@executor/plugin-google-discovery-http";
13	12	import { googleDiscoverySdkPlugin } from "@executor/plugin-google-discovery-sdk";
14	13	import { graphqlHttpPlugin } from "@executor/plugin-graphql-http";
@@ -155,7 +154,6 @@ const createExecutorRuntime = ( · 140 unmodified lines
155	154	localDataDir,
156	155	}),
157	156	plugins: [
158		− internalSdkPlugin(),
159	157	graphqlSdkPlugin({
160	158	storage: createFileGraphqlSourceStorage({
161	159	rootDir: resolve(localDataDir, "plugins", "graphql", "sources"),

packages/sources/core/src/source-models.ts+1−4

@@ -7,10 +7,7 @@ export const SecretRefSchema = Schema.Struct({ · 6 unmodified lines
7	7
8	8	export const CredentialSlotSchema = Schema.Literal("runtime", "import");
9	9
10		−export const SourceCatalogKindSchema = Schema.Literal(
11		− "imported",
12		− "internal",
13		−);
	10	+export const SourceCatalogKindSchema = Schema.Literal("imported");
14	11
15	12	export const SourceKindSchema = Schema.String;
16	13

plugins/internal/sdk/index.ts+0−43

@@ -1,43 +0,0 @@
1		−import * as Effect from "effect/Effect";
2		−
3		−import {
4		− createCatalogImportMetadata,
5		− createSourceCatalogSyncResult,
6		−} from "@executor/source-core";
7		−import type { ExecutorSdkPlugin } from "@executor/platform-sdk/plugins";
8		−
9		−export const internalSdkPlugin = (): ExecutorSdkPlugin<"internal"> => ({
10		− key: "internal",
11		− sources: [
12		− {
13		− kind: "internal",
14		− displayName: "Internal",
15		− catalogKind: "internal",
16		− catalogIdentity: ({ source }) => ({
17		− kind: "internal",
18		− sourceId: source.id,
19		− }),
20		− getIrModel: ({ source }) =>
21		− Effect.succeed(
22		− createSourceCatalogSyncResult({
23		− fragment: {
24		− version: "ir.v1.fragment",
25		− },
26		− importMetadata: {
27		− ...createCatalogImportMetadata({
28		− source,
29		− pluginKey: "internal",
30		− }),
31		− importerVersion: "ir.v1.internal",
32		− sourceConfigHash: "internal",
33		− },
34		− sourceHash: null,
35		− }),
36		− ),
37		− invoke: () =>
38		− Effect.fail(
39		− new Error("Internal sources do not support persisted plugin invocation"),
40		− ),
41		− },
42		− ],
43		−});

plugins/internal/sdk/package.json+0−24

@@ -1,24 +0,0 @@
1		−{
2		− "name": "@executor/plugin-internal-sdk",
3		− "private": true,
4		− "type": "module",
5		− "exports": {
6		− ".": "./index.ts"
7		− },
8		− "files": [
9		− "*.ts"
10		− ],
11		− "scripts": {
12		− "typecheck": "bunx tsc --noEmit -p tsconfig.json"
13		− },
14		− "dependencies": {
15		− "@executor/platform-sdk": "workspace:*",
16		− "@executor/source-core": "workspace:*",
17		− "effect": "catalog:"
18		− },
19		− "devDependencies": {
20		− "@types/node": "catalog:",
21		− "bun-types": "catalog:"
22		− },
23		− "version": "0.0.0"
24		−}

plugins/internal/sdk/tsconfig.json+0−13

@@ -1,13 +0,0 @@
1		−{
2		− "compilerOptions": {
3		− "target": "ES2022",
4		− "module": "ESNext",
5		− "moduleResolution": "Bundler",
6		− "strict": true,
7		− "skipLibCheck": true,
8		− "noEmit": true,
9		− "lib": ["ES2022", "DOM"],
10		− "types": ["bun-types", "node"]
11		− },
12		− "include": ["*.ts"]
13		−}