@gaganref/confect-cli 10.3.1-fork.5 → 10.3.1-fork.50
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/dist/Bundler.mjs +22 -1
- package/dist/Bundler.mjs.map +1 -1
- package/dist/CodegenError.mjs +17 -2
- package/dist/CodegenError.mjs.map +1 -1
- package/dist/Declaration.mjs +84 -18
- package/dist/Declaration.mjs.map +1 -1
- package/dist/EntryPoint.mjs +2 -0
- package/dist/EntryPoint.mjs.map +1 -1
- package/dist/Evaluation.mjs +39 -13
- package/dist/Evaluation.mjs.map +1 -1
- package/dist/EvaluationWorker.mjs +13 -1
- package/dist/EvaluationWorker.mjs.map +1 -1
- package/dist/FunctionModule.mjs +100 -24
- package/dist/FunctionModule.mjs.map +1 -1
- package/dist/LeafModule.mjs +29 -17
- package/dist/LeafModule.mjs.map +1 -1
- package/dist/ManifestSections.mjs +92 -0
- package/dist/ManifestSections.mjs.map +1 -0
- package/dist/SyncState.mjs +1 -1
- package/dist/SyncState.mjs.map +1 -1
- package/dist/Watcher.mjs +57 -55
- package/dist/Watcher.mjs.map +1 -1
- package/dist/confect/codegen.mjs +82 -34
- package/dist/confect/codegen.mjs.map +1 -1
- package/dist/confect/declaration.mjs +71 -16
- package/dist/confect/declaration.mjs.map +1 -1
- package/dist/confect/dev.mjs +9 -4
- package/dist/confect/dev.mjs.map +1 -1
- package/dist/templates.mjs +29 -15
- package/dist/templates.mjs.map +1 -1
- package/dist/utils.mjs +1 -1
- package/dist/utils.mjs.map +1 -1
- package/package.json +6 -5
package/dist/Declaration.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Declaration.mjs","names":[],"sources":["../src/Declaration.ts"],"sourcesContent":["import { App, Auth, Env } from \"@confect/core\";\nimport * as Data from \"effect/Data\";\nimport * as Option from \"effect/Option\";\nimport * as Predicate from \"effect/Predicate\";\nimport * as Result from \"effect/Result\";\n// oxlint-disable-next-line effecttsgo/node-builtin-import -- a synchronous hash of in-memory strings in a pure function; Effect's Crypto is a service.\nimport { createHash } from \"node:crypto\";\n\n/**\n * A backend's declaration (`confect/env.ts`, `app.ts`, `auth.ts`) reduced to\n * the plain data codegen renders. The evaluated modules are parsed into this\n * once, at {@link parse}; every renderer below is a pure function of it.\n */\nexport interface Declaration {\n readonly target: \"app\" | \"component\";\n readonly name: string;\n readonly env: ReadonlyArray<readonly [string, Env.Descriptor]>;\n readonly mounts: ReadonlyArray<Mount>;\n readonly providers: Option.Option<ReadonlyArray<Provider>>;\n}\n\nexport interface Mount {\n readonly name: string;\n readonly importPath: string;\n readonly componentName: string;\n readonly httpPrefix: string | undefined;\n readonly env: ReadonlyArray<readonly [string, Binding]>;\n}\n\nexport type Binding =\n | { readonly kind: \"value\"; readonly value: string }\n | { readonly kind: \"env\"; readonly key: string };\n\nexport type ProviderValue =\n | { readonly kind: \"value\"; readonly value: string }\n | { readonly kind: \"siteUrl\"; readonly path: string };\n\nexport type Provider = ReadonlyArray<readonly [string, ProviderValue]>;\n\nexport class NotADeclaration extends Data.TaggedError(\"NotADeclaration\")<{\n readonly file: string;\n readonly expected: string;\n}> {\n override get message(): string {\n return `${this.file} must default-export ${this.expected}.`;\n }\n}\n\nexport class InvalidEnvKey extends Data.TaggedError(\"InvalidEnvKey\")<{\n readonly key: string;\n}> {\n override get message(): string {\n return `\"${this.key}\" is not a valid Convex environment variable name; use letters, digits and underscores, starting with a letter.`;\n }\n}\n\nexport class InvalidMountName extends Data.TaggedError(\"InvalidMountName\")<{\n readonly mount: string;\n}> {\n override get message(): string {\n return `\"${this.mount}\" is not a valid mount name; use letters, digits and underscores, starting with a letter or underscore.`;\n }\n}\n\nexport class ForeignEnvBinding extends Data.TaggedError(\"ForeignEnvBinding\")<{\n readonly mount: string;\n readonly slot: string;\n readonly backend: string;\n readonly key: string;\n readonly expectedBackend: string;\n}> {\n override get message(): string {\n return `The mount \"${this.mount}\" binds ${this.slot} to ${this.key} of the \"${this.backend}\" env, but this backend's env is \"${this.expectedBackend}\".`;\n }\n}\n\nexport class InvalidBinding extends Data.TaggedError(\"InvalidBinding\")<{\n readonly mount: string;\n readonly slot: string;\n}> {\n override get message(): string {\n return `The mount \"${this.mount}\" binds ${this.slot} to something other than a string or an entry of this backend's env.`;\n }\n}\n\nexport class UnknownComponentImport extends Data.TaggedError(\n \"UnknownComponentImport\",\n)<{ readonly mount: string }> {\n override get message(): string {\n return `The mount \"${this.mount}\" must pass the default export of a component's convex.config module, imported directly in the declaration.`;\n }\n}\n\nexport class AuthForAnotherBackend extends Data.TaggedError(\n \"AuthForAnotherBackend\",\n)<{ readonly backend: string; readonly expectedBackend: string }> {\n override get message(): string {\n return `confect/auth.ts declares auth for the \"${this.backend}\" backend, but confect/app.ts declares \"${this.expectedBackend}\".`;\n }\n}\n\nexport type DeclarationError =\n | NotADeclaration\n | InvalidEnvKey\n | InvalidMountName\n | ForeignEnvBinding\n | InvalidBinding\n | UnknownComponentImport\n | AuthForAnotherBackend;\n\nconst ENV_KEY = /^[A-Za-z][A-Za-z0-9_]*$/;\nconst MOUNT_NAME = /^[A-Za-z_][A-Za-z0-9_]*$/;\n\n/**\n * The declaration file a parse error is about.\n */\nexport const fileOf = (error: DeclarationError): string =>\n error._tag === \"NotADeclaration\"\n ? error.file\n : error._tag === \"AuthForAnotherBackend\"\n ? \"confect/auth.ts\"\n : \"confect/app.ts\";\n\n/**\n * A mounted component's import as the generated `convex.config.ts` writes it.\n */\nexport interface ComponentImport {\n readonly importPath: string;\n readonly componentName: string;\n}\n\n/**\n * Parse the default exports of `confect/app.ts` and, when present,\n * `confect/auth.ts`. `componentImport` recovers how the generated config\n * imports a mounted definition; codegen's bundler records it.\n */\nexport const parse = (input: {\n readonly target: \"app\" | \"component\";\n readonly app: unknown;\n readonly auth: Option.Option<unknown>;\n readonly componentImport: (\n definition: unknown,\n ) => Option.Option<ComponentImport>;\n}): Result.Result<Declaration, DeclarationError> =>\n Result.gen(function* () {\n if (!App.isApp(input.app)) {\n return yield* Result.fail(\n new NotADeclaration({\n file: \"confect/app.ts\",\n expected: \"App.make(...)\",\n }),\n );\n }\n const env = App.env(input.app);\n const name = Env.name(env);\n const descriptors = Env.descriptors(env);\n for (const [key] of descriptors) {\n if (!ENV_KEY.test(key))\n return yield* Result.fail(new InvalidEnvKey({ key }));\n }\n\n const mounts: Array<Mount> = [];\n for (const mount of App.mounts(input.app)) {\n if (!MOUNT_NAME.test(mount.name)) {\n return yield* Result.fail(new InvalidMountName({ mount: mount.name }));\n }\n const component = input.componentImport(mount.definition);\n if (Option.isNone(component)) {\n return yield* Result.fail(\n new UnknownComponentImport({ mount: mount.name }),\n );\n }\n const bindings: Array<readonly [string, Binding]> = [];\n for (const [slot, bound] of Object.entries(mount.env)) {\n if (bound === undefined) continue;\n if (typeof bound === \"string\") {\n bindings.push([slot, { kind: \"value\", value: bound }]);\n continue;\n }\n if (!Env.isEntry(bound)) {\n return yield* Result.fail(\n new InvalidBinding({ mount: mount.name, slot }),\n );\n }\n const origin = Env.origin(bound);\n if (origin.backend !== name) {\n return yield* Result.fail(\n new ForeignEnvBinding({\n mount: mount.name,\n slot,\n backend: origin.backend,\n key: origin.key,\n expectedBackend: name,\n }),\n );\n }\n bindings.push([slot, { kind: \"env\", key: origin.key }]);\n }\n mounts.push({\n name: mount.name,\n importPath: component.value.importPath,\n componentName: component.value.componentName,\n httpPrefix: mount.httpPrefix,\n env: bindings,\n });\n }\n\n const providers: Option.Option<ReadonlyArray<Provider>> = Option.isNone(\n input.auth,\n )\n ? Option.none()\n : Option.some(yield* parseProviders(input.auth.value, name));\n\n return {\n target: input.target,\n name,\n env: descriptors,\n mounts,\n providers,\n };\n });\n\nconst parseProviders = (\n auth: unknown,\n backend: string,\n): Result.Result<ReadonlyArray<Provider>, DeclarationError> => {\n if (!Auth.isAuth(auth)) {\n return Result.fail(\n new NotADeclaration({\n file: \"confect/auth.ts\",\n expected: \"Auth.make(app, ...)\",\n }),\n );\n }\n const authBackend = Env.name(App.env(auth.app));\n if (authBackend !== backend) {\n return Result.fail(\n new AuthForAnotherBackend({\n backend: authBackend,\n expectedBackend: backend,\n }),\n );\n }\n return Result.succeed(\n Auth.providers(auth).map((provider) =>\n Object.entries(provider).map(([field, value]) => {\n const sitePath = Auth.siteUrlPath(value);\n return [\n field,\n sitePath === undefined\n ? {\n kind: \"value\",\n value: Predicate.isString(value)\n ? value\n : JSON.stringify(value),\n }\n : { kind: \"siteUrl\", path: sitePath },\n ] as const;\n }),\n ),\n );\n};\n\nconst quote = (value: string): string => JSON.stringify(value);\n\nexport const header = (source: string): string =>\n `// Generated by \\`confect codegen\\` from ${source}. Do not edit.`;\n\nconst GENERATED_PREFIX = \"// Generated by `confect codegen` from \";\n\n/**\n * Whether codegen may overwrite or remove an existing file: it carries the\n * generated header, or it is exactly one of the files an earlier codegen wrote\n * there (`legacy`).\n */\nexport const isGenerated = (\n contents: string,\n legacy: ReadonlyArray<string>,\n): boolean =>\n contents.startsWith(GENERATED_PREFIX) || legacy.includes(contents);\n\nconst validator = (descriptor: Env.Descriptor): string => {\n const base =\n descriptor.kind === \"literals\"\n ? descriptor.values.length === 1\n ? `v.literal(${quote(descriptor.values[0])})`\n : `v.union(${descriptor.values.map((value) => `v.literal(${quote(value)})`).join(\", \")})`\n : \"v.string()\";\n return descriptor.optional ? `v.optional(${base})` : base;\n};\n\nconst RESERVED = new Set(\n \"await break case catch class const continue debugger default delete do else enum export extends false finally for function if implements import in instanceof interface let new null package private protected public return static super switch this throw true try typeof var void while with yield\".split(\n \" \",\n ),\n);\n\n/**\n * A safe import name for a component, from its Convex name.\n */\nconst identifier = (name: string): string => {\n const cleaned = name.replaceAll(/[^A-Za-z0-9_$]/g, \"_\");\n const valid = /^[A-Za-z_$]/.test(cleaned) ? cleaned : `_${cleaned}`;\n return RESERVED.has(valid) ? `${valid}Component` : valid;\n};\n\n/**\n * `convex/convex.config.ts`: Convex's own app or component definition.\n */\nexport const convexConfig = (declaration: Declaration): string => {\n const self = declaration.target === \"app\" ? \"app\" : \"component\";\n const aliases = new Map<string, string>();\n const taken = new Set([self, \"v\", \"defineApp\", \"defineComponent\"]);\n for (const mount of declaration.mounts) {\n if (aliases.has(mount.importPath)) continue;\n const base = identifier(mount.componentName);\n let alias = base;\n for (let n = 2; taken.has(alias); n++) alias = `${base}${n}`;\n taken.add(alias);\n aliases.set(mount.importPath, alias);\n }\n\n const lines = [header(\"confect/app.ts\")];\n lines.push(\n declaration.target === \"app\"\n ? 'import { defineApp } from \"convex/server\";'\n : 'import { defineComponent } from \"convex/server\";',\n );\n if (declaration.env.length > 0)\n lines.push('import { v } from \"convex/values\";');\n for (const [importPath, alias] of aliases) {\n lines.push(`import ${alias} from ${quote(importPath)};`);\n }\n lines.push(\"\");\n\n const envBlock =\n declaration.env.length === 0\n ? []\n : [\n \" env: {\",\n ...declaration.env.map(\n ([key, descriptor]) => ` ${key}: ${validator(descriptor)},`,\n ),\n \" },\",\n ];\n if (declaration.target === \"app\") {\n lines.push(\n envBlock.length === 0\n ? \"const app = defineApp();\"\n : [\"const app = defineApp({\", ...envBlock, \"});\"].join(\"\\n\"),\n );\n } else {\n lines.push(\n envBlock.length === 0\n ? `const component = defineComponent(${quote(declaration.name)});`\n : [\n `const component = defineComponent(${quote(declaration.name)}, {`,\n ...envBlock,\n \"});\",\n ].join(\"\\n\"),\n );\n }\n\n for (const mount of declaration.mounts) {\n lines.push(\"\");\n lines.push(`${self}.use(${aliases.get(mount.importPath)}, {`);\n lines.push(` name: ${quote(mount.name)},`);\n if (mount.httpPrefix !== undefined) {\n lines.push(` httpPrefix: ${quote(mount.httpPrefix)},`);\n }\n if (mount.env.length > 0) {\n lines.push(\" env: {\");\n for (const [slot, binding] of mount.env) {\n lines.push(\n ` ${slot}: ${binding.kind === \"value\" ? quote(binding.value) : `${self}.env.${binding.key}`},`,\n );\n }\n lines.push(\" },\");\n }\n lines.push(\"});\");\n }\n\n lines.push(\"\", `export default ${self};`, \"\");\n return lines.join(\"\\n\");\n};\n\nconst providerValue = (value: ProviderValue): string =>\n value.kind === \"value\"\n ? quote(value.value)\n : `\\`\\${process.env.CONVEX_SITE_URL}${value.path.replaceAll(/[`$\\\\]/g, \"\\\\$&\")}\\``;\n\n/**\n * `convex/auth.config.ts`: Convex's provider list, with site URLs resolved\n * there.\n */\nexport const authConfig = (providers: ReadonlyArray<Provider>): string =>\n [\n header(\"confect/auth.ts\"),\n 'import type { AuthConfig } from \"convex/server\";',\n \"\",\n \"export default {\",\n providers.length === 0 ? \" providers: [],\" : \" providers: [\",\n ...(providers.length === 0\n ? []\n : [\n ...providers.flatMap((provider) => [\n \" {\",\n ...provider.map(\n ([field, value]) => ` ${field}: ${providerValue(value)},`,\n ),\n \" },\",\n ]),\n \" ],\",\n ]),\n \"} satisfies AuthConfig;\",\n \"\",\n ].join(\"\\n\");\n\n/**\n * `confect/_generated/manifest.ts`: plain data, no imports, for infra.\n */\nexport const manifest = (declaration: Declaration, digest: string): string => {\n const data = {\n name: declaration.name,\n env: Object.fromEntries(declaration.env),\n http: {\n mounts: Object.fromEntries(\n declaration.mounts.flatMap(({ name, httpPrefix }) =>\n httpPrefix === undefined ? [] : [[name, httpPrefix]],\n ),\n ),\n },\n digest,\n };\n return `${header(\"confect/env.ts and confect/app.ts\")}\\n\\nexport default ${JSON.stringify(data, null, 2)} as const;\\n`;\n};\n\n/**\n * A digest of the declaration's inputs: every first-party file its modules\n * import (by project-relative path and contents) and the versions of the\n * packages that shape the generated output.\n */\nexport const digest = (input: {\n readonly files: ReadonlyArray<readonly [string, string]>;\n readonly versions: ReadonlyArray<readonly [string, string]>;\n}): string => {\n const hash = createHash(\"sha256\");\n const byFirst = (\n a: readonly [string, string],\n b: readonly [string, string],\n ) => (a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0);\n hash.update(\n JSON.stringify({\n files: [...input.files].sort(byFirst),\n versions: [...input.versions].sort(byFirst),\n }),\n );\n return `sha256:${hash.digest(\"hex\")}`;\n};\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Declaration.mjs","names":[],"sources":["../src/Declaration.ts"],"sourcesContent":["import { App, Auth, Env } from \"@confect/core\";\nimport * as Data from \"effect/Data\";\nimport * as Option from \"effect/Option\";\nimport * as Predicate from \"effect/Predicate\";\nimport * as Result from \"effect/Result\";\n// oxlint-disable-next-line effecttsgo/node-builtin-import -- a synchronous hash of in-memory strings in a pure function; Effect's Crypto is a service.\nimport { createHash } from \"node:crypto\";\n\n/**\n * A backend's declaration (`confect/env.ts`, `app.ts`, `auth.ts`) reduced to\n * the plain data codegen renders. The evaluated modules are parsed into this\n * once, at {@link parse}; every renderer below is a pure function of it.\n */\nexport interface Declaration {\n readonly target: \"app\" | \"component\";\n readonly name: string;\n readonly env: ReadonlyArray<readonly [string, Env.Descriptor]>;\n readonly mounts: ReadonlyArray<Mount>;\n readonly providers: Option.Option<ReadonlyArray<Provider>>;\n}\n\nexport interface Mount {\n readonly name: string;\n readonly importPath: string;\n readonly componentName: string;\n readonly httpPrefix: string | undefined;\n readonly env: ReadonlyArray<readonly [string, Binding]>;\n}\n\nexport type Binding =\n | { readonly kind: \"value\"; readonly value: string }\n | { readonly kind: \"env\"; readonly key: string };\n\nexport type ProviderValue =\n | { readonly kind: \"value\"; readonly value: string }\n | { readonly kind: \"siteUrl\" | \"cloudUrl\"; readonly path: string }\n | { readonly kind: \"env\"; readonly key: string };\n\nexport type Provider = ReadonlyArray<readonly [string, ProviderValue]>;\n\nexport class NotADeclaration extends Data.TaggedError(\"NotADeclaration\")<{\n readonly file: string;\n readonly expected: string;\n}> {\n override get message(): string {\n return `${this.file} must default-export ${this.expected}.`;\n }\n}\n\nexport class InvalidEnvKey extends Data.TaggedError(\"InvalidEnvKey\")<{\n readonly key: string;\n}> {\n override get message(): string {\n return `\"${this.key}\" is not a valid Convex environment variable name; use letters, digits and underscores, starting with a letter.`;\n }\n}\n\nexport class InvalidMountName extends Data.TaggedError(\"InvalidMountName\")<{\n readonly mount: string;\n}> {\n override get message(): string {\n return `\"${this.mount}\" is not a valid mount name; use letters, digits and underscores, starting with a letter or underscore.`;\n }\n}\n\nexport class ForeignEnvBinding extends Data.TaggedError(\"ForeignEnvBinding\")<{\n readonly mount: string;\n readonly slot: string;\n readonly backend: string;\n readonly key: string;\n readonly expectedBackend: string;\n}> {\n override get message(): string {\n return `The mount \"${this.mount}\" binds ${this.slot} to ${this.key} of the \"${this.backend}\" env, but this backend's env is \"${this.expectedBackend}\".`;\n }\n}\n\nexport class InvalidBinding extends Data.TaggedError(\"InvalidBinding\")<{\n readonly mount: string;\n readonly slot: string;\n}> {\n override get message(): string {\n return `The mount \"${this.mount}\" binds ${this.slot} to something other than a string or an entry of this backend's env.`;\n }\n}\n\nexport class UnknownComponentImport extends Data.TaggedError(\n \"UnknownComponentImport\",\n)<{ readonly mount: string }> {\n override get message(): string {\n return `The mount \"${this.mount}\" must pass the default export of a component's convex.config module, imported directly in the declaration.`;\n }\n}\n\nexport class AuthForAnotherBackend extends Data.TaggedError(\n \"AuthForAnotherBackend\",\n)<{ readonly backend: string; readonly expectedBackend: string }> {\n override get message(): string {\n return `confect/auth.ts declares auth for the \"${this.backend}\" backend, but confect/app.ts declares \"${this.expectedBackend}\".`;\n }\n}\n\nexport class InvalidProviderEnv extends Data.TaggedError(\"InvalidProviderEnv\")<{\n readonly field: string;\n readonly key: string;\n readonly backend: string;\n}> {\n override get message(): string {\n return `Auth provider field \"${this.field}\" requires a non-secret, required string entry of the \"${this.backend}\" env; got \"${this.key}\".`;\n }\n}\n\nexport type DeclarationError =\n | NotADeclaration\n | InvalidEnvKey\n | InvalidMountName\n | ForeignEnvBinding\n | InvalidBinding\n | UnknownComponentImport\n | AuthForAnotherBackend\n | InvalidProviderEnv;\n\nconst ENV_KEY = /^[A-Za-z][A-Za-z0-9_]*$/;\nconst MOUNT_NAME = /^[A-Za-z_][A-Za-z0-9_]*$/;\n\n/**\n * The declaration file a parse error is about.\n */\nexport const fileOf = (error: DeclarationError): string =>\n error._tag === \"NotADeclaration\"\n ? error.file\n : error._tag === \"AuthForAnotherBackend\" ||\n error._tag === \"InvalidProviderEnv\"\n ? \"confect/auth.ts\"\n : \"confect/app.ts\";\n\n/**\n * A mounted component's import as the generated `convex.config.ts` writes it.\n */\nexport interface ComponentImport {\n readonly importPath: string;\n readonly componentName: string;\n}\n\n/**\n * Parse the default exports of `confect/app.ts` and, when present,\n * `confect/auth.ts`. `componentImport` recovers how the generated config\n * imports a mounted definition; codegen's bundler records it.\n */\nexport const parse = (input: {\n readonly target: \"app\" | \"component\";\n readonly app: unknown;\n readonly auth: Option.Option<unknown>;\n readonly componentImport: (\n definition: unknown,\n ) => Option.Option<ComponentImport>;\n}): Result.Result<Declaration, DeclarationError> =>\n Result.gen(function* () {\n if (!App.isApp(input.app)) {\n return yield* Result.fail(\n new NotADeclaration({\n file: \"confect/app.ts\",\n expected: \"App.make(...)\",\n }),\n );\n }\n const env = App.env(input.app);\n const name = Env.name(env);\n const descriptors = Env.descriptors(env);\n for (const [key] of descriptors) {\n if (!ENV_KEY.test(key))\n return yield* Result.fail(new InvalidEnvKey({ key }));\n }\n\n const mounts: Array<Mount> = [];\n for (const mount of App.mounts(input.app)) {\n if (!MOUNT_NAME.test(mount.name)) {\n return yield* Result.fail(new InvalidMountName({ mount: mount.name }));\n }\n const component = input.componentImport(mount.definition);\n if (Option.isNone(component)) {\n return yield* Result.fail(\n new UnknownComponentImport({ mount: mount.name }),\n );\n }\n const bindings: Array<readonly [string, Binding]> = [];\n for (const [slot, bound] of Object.entries(mount.env)) {\n if (bound === undefined) continue;\n if (typeof bound === \"string\") {\n bindings.push([slot, { kind: \"value\", value: bound }]);\n continue;\n }\n if (!Env.isEntry(bound)) {\n return yield* Result.fail(\n new InvalidBinding({ mount: mount.name, slot }),\n );\n }\n const origin = Env.origin(bound);\n if (origin.backend !== name) {\n return yield* Result.fail(\n new ForeignEnvBinding({\n mount: mount.name,\n slot,\n backend: origin.backend,\n key: origin.key,\n expectedBackend: name,\n }),\n );\n }\n bindings.push([slot, { kind: \"env\", key: origin.key }]);\n }\n mounts.push({\n name: mount.name,\n importPath: component.value.importPath,\n componentName: component.value.componentName,\n httpPrefix: mount.httpPrefix,\n env: bindings,\n });\n }\n\n const providers: Option.Option<ReadonlyArray<Provider>> = Option.isNone(\n input.auth,\n )\n ? Option.none()\n : Option.some(yield* parseProviders(input.auth.value, name));\n\n return {\n target: input.target,\n name,\n env: descriptors,\n mounts,\n providers,\n };\n });\n\nconst parseProviders = (\n auth: unknown,\n backend: string,\n): Result.Result<ReadonlyArray<Provider>, DeclarationError> => {\n if (!Auth.isAuth(auth)) {\n return Result.fail(\n new NotADeclaration({\n file: \"confect/auth.ts\",\n expected: \"Auth.make(app, ...)\",\n }),\n );\n }\n const authBackend = Env.name(App.env(auth.app));\n if (authBackend !== backend) {\n return Result.fail(\n new AuthForAnotherBackend({\n backend: authBackend,\n expectedBackend: backend,\n }),\n );\n }\n return Result.gen(function* () {\n const providers: Provider[] = [];\n for (const provider of Auth.providers(auth)) {\n const fields: Array<readonly [string, ProviderValue]> = [];\n for (const [field, value] of Object.entries(provider)) {\n const sitePath = Auth.siteUrlPath(value);\n const cloudPath = Auth.cloudUrlPath(value);\n let lowered: ProviderValue;\n if (Env.isEntry(value)) {\n const { backend: owner, key } = Env.origin(value);\n const descriptor = value[\"~@confect/core/Env/Entry\"].descriptor;\n if (\n owner !== backend ||\n descriptor.optional ||\n descriptor.kind === \"secret\" ||\n !ENV_KEY.test(key)\n ) {\n return yield* Result.fail(\n new InvalidProviderEnv({ field, key, backend }),\n );\n }\n lowered = { kind: \"env\", key };\n } else if (sitePath !== undefined) {\n lowered = { kind: \"siteUrl\", path: sitePath };\n } else if (cloudPath !== undefined) {\n lowered = { kind: \"cloudUrl\", path: cloudPath };\n } else {\n lowered = {\n kind: \"value\",\n value: Predicate.isString(value) ? value : JSON.stringify(value),\n };\n }\n fields.push([field, lowered]);\n }\n providers.push(fields);\n }\n return providers;\n });\n};\n\nconst quote = (value: string): string => JSON.stringify(value);\n\nexport const header = (source: string): string =>\n `// Generated by \\`confect codegen\\` from ${source}. Do not edit.`;\n\nconst GENERATED_PREFIX = \"// Generated by `confect codegen` from \";\n\n/**\n * Whether codegen may overwrite or remove an existing file: it carries the\n * generated header, or it is exactly one of the files an earlier codegen wrote\n * there (`legacy`).\n */\nexport const isGenerated = (\n contents: string,\n legacy: ReadonlyArray<string>,\n): boolean =>\n contents.startsWith(GENERATED_PREFIX) || legacy.includes(contents);\n\nconst validator = (descriptor: Env.Descriptor): string => {\n const base =\n descriptor.kind === \"literals\"\n ? descriptor.values.length === 1\n ? `v.literal(${quote(descriptor.values[0])})`\n : `v.union(${descriptor.values.map((value) => `v.literal(${quote(value)})`).join(\", \")})`\n : \"v.string()\";\n return descriptor.optional ? `v.optional(${base})` : base;\n};\n\nconst RESERVED = new Set(\n \"await break case catch class const continue debugger default delete do else enum export extends false finally for function if implements import in instanceof interface let new null package private protected public return static super switch this throw true try typeof var void while with yield\".split(\n \" \",\n ),\n);\n\n/**\n * A safe import name for a component, from its Convex name.\n */\nconst identifier = (name: string): string => {\n const cleaned = name.replaceAll(/[^A-Za-z0-9_$]/g, \"_\");\n const valid = /^[A-Za-z_$]/.test(cleaned) ? cleaned : `_${cleaned}`;\n return RESERVED.has(valid) ? `${valid}Component` : valid;\n};\n\n/**\n * `convex/convex.config.ts`: Convex's own app or component definition.\n */\nexport const convexConfig = (declaration: Declaration): string => {\n const self = declaration.target === \"app\" ? \"app\" : \"component\";\n const aliases = new Map<string, string>();\n const taken = new Set([self, \"v\", \"defineApp\", \"defineComponent\"]);\n for (const mount of declaration.mounts) {\n if (aliases.has(mount.importPath)) continue;\n const base = identifier(mount.componentName);\n let alias = base;\n for (let n = 2; taken.has(alias); n++) alias = `${base}${n}`;\n taken.add(alias);\n aliases.set(mount.importPath, alias);\n }\n\n const lines = [header(\"confect/app.ts\")];\n lines.push(\n declaration.target === \"app\"\n ? 'import { defineApp } from \"convex/server\";'\n : 'import { defineComponent } from \"convex/server\";',\n );\n if (declaration.env.length > 0)\n lines.push('import { v } from \"convex/values\";');\n for (const [importPath, alias] of aliases) {\n lines.push(`import ${alias} from ${quote(importPath)};`);\n }\n lines.push(\"\");\n\n const envBlock =\n declaration.env.length === 0\n ? []\n : [\n \" env: {\",\n ...declaration.env.map(\n ([key, descriptor]) => ` ${key}: ${validator(descriptor)},`,\n ),\n \" },\",\n ];\n if (declaration.target === \"app\") {\n lines.push(\n envBlock.length === 0\n ? \"const app = defineApp();\"\n : [\"const app = defineApp({\", ...envBlock, \"});\"].join(\"\\n\"),\n );\n } else {\n lines.push(\n envBlock.length === 0\n ? `const component = defineComponent(${quote(declaration.name)});`\n : [\n `const component = defineComponent(${quote(declaration.name)}, {`,\n ...envBlock,\n \"});\",\n ].join(\"\\n\"),\n );\n }\n\n for (const mount of declaration.mounts) {\n lines.push(\"\");\n lines.push(`${self}.use(${aliases.get(mount.importPath)}, {`);\n lines.push(` name: ${quote(mount.name)},`);\n if (mount.httpPrefix !== undefined) {\n lines.push(` httpPrefix: ${quote(mount.httpPrefix)},`);\n }\n if (mount.env.length > 0) {\n lines.push(\" env: {\");\n for (const [slot, binding] of mount.env) {\n lines.push(\n ` ${slot}: ${binding.kind === \"value\" ? quote(binding.value) : `${self}.env.${binding.key}`},`,\n );\n }\n lines.push(\" },\");\n }\n lines.push(\"});\");\n }\n\n lines.push(\"\", `export default ${self};`, \"\");\n return lines.join(\"\\n\");\n};\n\nconst providerValue = (value: ProviderValue): string => {\n switch (value.kind) {\n case \"value\":\n return quote(value.value);\n case \"env\":\n return `process.env[${quote(value.key)}]!`;\n default:\n return `\\`\\${process.env.${value.kind === \"siteUrl\" ? \"CONVEX_SITE_URL\" : \"CONVEX_CLOUD_URL\"}}${value.path.replaceAll(/[`$\\\\]/g, \"\\\\$&\")}\\``;\n }\n};\n\n/**\n * `convex/auth.config.ts`: Convex's provider list, with site URLs resolved\n * there.\n */\nexport const authConfig = (providers: ReadonlyArray<Provider>): string =>\n [\n header(\"confect/auth.ts\"),\n 'import type { AuthConfig } from \"convex/server\";',\n \"\",\n \"export default {\",\n providers.length === 0 ? \" providers: [],\" : \" providers: [\",\n ...(providers.length === 0\n ? []\n : [\n ...providers.flatMap((provider) => [\n \" {\",\n ...provider\n .filter(([field]) => field !== \"family\" && field !== \"name\")\n .map(\n ([field, value]) => ` ${field}: ${providerValue(value)},`,\n ),\n \" },\",\n ]),\n \" ],\",\n ]),\n \"} satisfies AuthConfig;\",\n \"\",\n ].join(\"\\n\");\n\n/**\n * Runtime issuer data with no dependency on declarations or component\n * definitions.\n */\nexport const authProviders = (providers: ReadonlyArray<Provider>): string =>\n [\n header(\"confect/auth.ts\"),\n \"\",\n \"export const providers = [\",\n ...providers.flatMap((provider) => [\n \" {\",\n ...provider.flatMap(([field, value]) => {\n const key =\n field === \"domain\"\n ? \"issuer\"\n : field === \"applicationID\"\n ? \"audience\"\n : field;\n return [\"issuer\", \"audience\", \"family\", \"name\"].includes(key)\n ? [` ${key}: ${providerValue(value)},`]\n : [];\n }),\n \" },\",\n ]),\n \"] as const;\",\n \"\",\n ].join(\"\\n\");\n\n/**\n * `confect/_generated/manifest.ts`: plain data, no imports, for infra.\n */\nexport const manifest = (\n declaration: Declaration,\n digest: string,\n sections: Readonly<Record<string, unknown>> = {},\n): string => {\n const data = {\n name: declaration.name,\n env: Object.fromEntries(declaration.env),\n http: {\n mounts: Object.fromEntries(\n declaration.mounts.flatMap(({ name, httpPrefix }) =>\n httpPrefix === undefined ? [] : [[name, httpPrefix]],\n ),\n ),\n },\n digest,\n ...sections,\n };\n return renderManifest(data);\n};\n\nexport const renderManifest = (\n data: Readonly<Record<string, unknown>>,\n): string =>\n `${header(\"confect/env.ts and confect/app.ts\")}\\n\\nexport default ${JSON.stringify(data, null, 2)} as const;\\n`;\n\n/**\n * A digest of the declaration's inputs: every first-party file its modules\n * import (by project-relative path and contents) and the versions of the\n * packages that shape the generated output.\n */\nexport const digest = (input: {\n readonly files: ReadonlyArray<readonly [string, string]>;\n readonly versions: ReadonlyArray<readonly [string, string]>;\n readonly sections?: Readonly<Record<string, unknown>>;\n}): string => {\n const hash = createHash(\"sha256\");\n const byFirst = (\n a: readonly [string, string],\n b: readonly [string, string],\n ) => (a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0);\n hash.update(\n JSON.stringify({\n files: [...input.files].sort(byFirst),\n versions: [...input.versions].sort(byFirst),\n ...(input.sections === undefined ? {} : { sections: input.sections }),\n }),\n );\n return `sha256:${hash.digest(\"hex\")}`;\n};\n"],"mappings":"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"}
|
package/dist/EntryPoint.mjs
CHANGED
|
@@ -46,6 +46,7 @@ const planDeclarations = (declarations, affectedImpls, path) => {
|
|
|
46
46
|
};
|
|
47
47
|
const isOptional = Predicate.or(Kind.$is("Http"), Predicate.or(Kind.$is("Crons"), Kind.$is("Auth")));
|
|
48
48
|
const parse = (relativePath) => {
|
|
49
|
+
if (relativePath === "runtime.ts") return Option.some(Kind.Runtime({ relativePath }));
|
|
49
50
|
if (relativePath === "env.ts") return Option.some(Kind.Env({ relativePath }));
|
|
50
51
|
if (relativePath === "app.ts") return Option.some(Kind.App({ relativePath }));
|
|
51
52
|
if (relativePath === "callbacks.ts") return Option.some(Kind.Callbacks({ relativePath }));
|
|
@@ -74,6 +75,7 @@ const discover = Effect.gen(function* () {
|
|
|
74
75
|
const declaration = yield* tryEntry(Kind.App({ relativePath: "app.ts" }));
|
|
75
76
|
const fixedEntryOptions = yield* Effect.all([
|
|
76
77
|
tryEntry(Kind.Env({ relativePath: "env.ts" })),
|
|
78
|
+
tryEntry(Kind.Runtime({ relativePath: "runtime.ts" })),
|
|
77
79
|
Effect.succeed(declaration),
|
|
78
80
|
(yield* ConvexDirectory.target).kind === "component" ? tryEntry(Kind.Callbacks({ relativePath: "callbacks.ts" })) : Effect.succeedNone,
|
|
79
81
|
tryEntry(Kind.Http({ relativePath: "http.ts" })),
|
package/dist/EntryPoint.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntryPoint.mjs","names":["SpecModulePath.SpecModulePath","SpecModulePath.toImpl"],"sources":["../src/EntryPoint.ts"],"sourcesContent":["import * as Array from \"effect/Array\";\nimport * as Chunk from \"effect/Chunk\";\nimport * as Data from \"effect/Data\";\nimport * as Effect from \"effect/Effect\";\nimport * as FileSystem from \"effect/FileSystem\";\nimport * as HashSet from \"effect/HashSet\";\nimport * as Option from \"effect/Option\";\nimport * as Path from \"effect/Path\";\nimport * as Predicate from \"effect/Predicate\";\nimport * as Schema from \"effect/Schema\";\nimport { ImplModulePath } from \"./ImplModulePath.js\";\nimport * as SpecModulePath from \"./SpecModulePath.js\";\nimport { TableModulePath } from \"./TableModulePath.js\";\nimport { ConfectDirectory } from \"./ConfectDirectory.js\";\nimport { ConvexDirectory } from \"./ConvexDirectory.js\";\nimport { CONVEX_CONFIG_FILENAME } from \"./ConvexConfig.js\";\nimport { discoverLeafImplFiles, discoverLeafSpecFiles } from \"./LeafModule.js\";\nimport { discoverTableFiles, type TableModule } from \"./TableModule.js\";\n\nexport type Kind = Data.TaggedEnum<{\n Env: { readonly relativePath: \"env.ts\" };\n App: { readonly relativePath: \"app.ts\" };\n Callbacks: { readonly relativePath: \"callbacks.ts\" };\n Spec: { readonly relativePath: SpecModulePath.SpecModulePath };\n Impl: { readonly relativePath: ImplModulePath };\n Table: { readonly relativePath: TableModulePath };\n Http: { readonly relativePath: \"http.ts\" };\n Crons: { readonly relativePath: \"crons.ts\" };\n Auth: { readonly relativePath: \"auth.ts\" };\n Config: {};\n}>;\n\nexport const Kind = Data.taggedEnum<Kind>();\nexport const Declaration = Schema.TaggedUnion({\n Spec: { relativePath: SpecModulePath.SpecModulePath },\n Table: { relativePath: TableModulePath },\n});\nexport type Declaration = typeof Declaration.Type;\n\nexport const planDeclarations = (\n declarations: Array.NonEmptyReadonlyArray<Declaration>,\n affectedImpls: ReadonlyArray<ImplModulePath>,\n path: Path.Path,\n): {\n readonly tables: ReadonlyArray<TableModule>;\n readonly paths: ReadonlyArray<ImplModulePath>;\n} => {\n const plan = Array.reduce(\n declarations,\n {\n tables: Chunk.empty<TableModule>(),\n paths: HashSet.fromIterable(affectedImpls),\n },\n (state, declaration) =>\n Declaration.match(declaration, {\n Spec: ({ relativePath }) => ({\n ...state,\n paths: HashSet.add(state.paths, SpecModulePath.toImpl(relativePath)),\n }),\n Table: ({ relativePath }) => ({\n ...state,\n tables: Chunk.append(state.tables, {\n relativePath,\n tableName: path.parse(relativePath).name,\n }),\n }),\n }),\n );\n return {\n tables: Chunk.toReadonlyArray(plan.tables),\n paths: Array.fromIterable(plan.paths),\n };\n};\n\nexport type EntryPoint = Kind & {\n readonly absolutePath: string;\n readonly inputPath: string;\n};\nexport type OptionalFile = \"Http\" | \"Crons\" | \"Auth\";\n\nexport const isOptional = Predicate.or(\n Kind.$is(\"Http\"),\n Predicate.or(Kind.$is(\"Crons\"), Kind.$is(\"Auth\")),\n);\n\nexport const parse = (\n relativePath: string,\n): Option.Option<Exclude<Kind, { readonly _tag: \"Config\" }>> => {\n if (relativePath === \"env.ts\") return Option.some(Kind.Env({ relativePath }));\n if (relativePath === \"app.ts\") return Option.some(Kind.App({ relativePath }));\n if (relativePath === \"callbacks.ts\")\n return Option.some(Kind.Callbacks({ relativePath }));\n if (relativePath === \"http.ts\")\n return Option.some(Kind.Http({ relativePath }));\n if (relativePath === \"crons.ts\")\n return Option.some(Kind.Crons({ relativePath }));\n if (relativePath === \"auth.ts\")\n return Option.some(Kind.Auth({ relativePath }));\n const tablePath = Schema.decodeOption(TableModulePath)(relativePath);\n if (Option.isSome(tablePath))\n return Option.some(Kind.Table({ relativePath: tablePath.value }));\n const specPath = Schema.decodeOption(SpecModulePath.SpecModulePath)(\n relativePath,\n );\n if (Option.isSome(specPath))\n return Option.some(Kind.Spec({ relativePath: specPath.value }));\n return Schema.decodeOption(ImplModulePath)(relativePath).pipe(\n Option.map((implPath) => Kind.Impl({ relativePath: implPath })),\n );\n};\n\nexport const discover = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n\n const tryEntry = Effect.fnUntraced(function* (\n kind: Exclude<Kind, { readonly _tag: \"Config\" }>,\n ) {\n const absolutePath = path.join(confectDirectory, kind.relativePath);\n if (!(yield* fs.exists(absolutePath))) {\n return Option.none<EntryPoint>();\n }\n return Option.some<EntryPoint>({\n ...kind,\n absolutePath,\n inputPath: yield* fs\n .realPath(absolutePath)\n .pipe(Effect.orElseSucceed(() => absolutePath)),\n });\n });\n\n const declaration = yield* tryEntry(Kind.App({ relativePath: \"app.ts\" }));\n const fixedEntryOptions = yield* Effect.all([\n tryEntry(Kind.Env({ relativePath: \"env.ts\" })),\n Effect.succeed(declaration),\n (yield* ConvexDirectory.target).kind === \"component\"\n ? tryEntry(Kind.Callbacks({ relativePath: \"callbacks.ts\" }))\n : Effect.succeedNone,\n tryEntry(Kind.Http({ relativePath: \"http.ts\" })),\n tryEntry(Kind.Crons({ relativePath: \"crons.ts\" })),\n tryEntry(Kind.Auth({ relativePath: \"auth.ts\" })),\n ]);\n\n const moduleRelativePaths = yield* Effect.all([\n discoverLeafSpecFiles,\n discoverLeafImplFiles,\n discoverTableFiles,\n ]).pipe(Effect.map(Array.flatten));\n const moduleEntryOptions = yield* Effect.forEach(\n Array.getSomes(moduleRelativePaths.map(parse)),\n tryEntry,\n );\n\n // `convex/convex.config.ts` feeds the generated components registry, so\n // edits to it (or to a locally-defined component definition it imports—npm component definitions are externalized and not watched) must re-run\n // codegen.\n const convexDirectory = yield* ConvexDirectory.get;\n const convexConfigEntryOption = yield* Effect.gen(function* () {\n const absolutePath = path.join(convexDirectory, CONVEX_CONFIG_FILENAME);\n // A declared backend's `convex.config.ts` is codegen output, not input.\n if (Option.isSome(declaration) || !(yield* fs.exists(absolutePath))) {\n return Option.none<EntryPoint>();\n }\n return Option.some<EntryPoint>({\n ...Kind.Config(),\n absolutePath,\n inputPath: yield* fs\n .realPath(absolutePath)\n .pipe(Effect.orElseSucceed(() => absolutePath)),\n });\n });\n\n return Array.getSomes([\n ...fixedEntryOptions,\n convexConfigEntryOption,\n ...moduleEntryOptions,\n ]);\n}).pipe(\n Effect.retry({\n times: 3,\n while: (error) =>\n error._tag === \"PlatformError\" && error.reason._tag === \"NotFound\",\n }),\n);\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"EntryPoint.mjs","names":["SpecModulePath.SpecModulePath","SpecModulePath.toImpl"],"sources":["../src/EntryPoint.ts"],"sourcesContent":["import * as Array from \"effect/Array\";\nimport * as Chunk from \"effect/Chunk\";\nimport * as Data from \"effect/Data\";\nimport * as Effect from \"effect/Effect\";\nimport * as FileSystem from \"effect/FileSystem\";\nimport * as HashSet from \"effect/HashSet\";\nimport * as Option from \"effect/Option\";\nimport * as Path from \"effect/Path\";\nimport * as Predicate from \"effect/Predicate\";\nimport * as Schema from \"effect/Schema\";\nimport { ImplModulePath } from \"./ImplModulePath.js\";\nimport * as SpecModulePath from \"./SpecModulePath.js\";\nimport { TableModulePath } from \"./TableModulePath.js\";\nimport { ConfectDirectory } from \"./ConfectDirectory.js\";\nimport { ConvexDirectory } from \"./ConvexDirectory.js\";\nimport { CONVEX_CONFIG_FILENAME } from \"./ConvexConfig.js\";\nimport { discoverLeafImplFiles, discoverLeafSpecFiles } from \"./LeafModule.js\";\nimport { discoverTableFiles, type TableModule } from \"./TableModule.js\";\n\nexport type Kind = Data.TaggedEnum<{\n Env: { readonly relativePath: \"env.ts\" };\n App: { readonly relativePath: \"app.ts\" };\n Runtime: { readonly relativePath: \"runtime.ts\" };\n Callbacks: { readonly relativePath: \"callbacks.ts\" };\n Spec: { readonly relativePath: SpecModulePath.SpecModulePath };\n Impl: { readonly relativePath: ImplModulePath };\n Table: { readonly relativePath: TableModulePath };\n Http: { readonly relativePath: \"http.ts\" };\n Crons: { readonly relativePath: \"crons.ts\" };\n Auth: { readonly relativePath: \"auth.ts\" };\n Config: {};\n}>;\n\nexport const Kind = Data.taggedEnum<Kind>();\nexport const Declaration = Schema.TaggedUnion({\n Spec: { relativePath: SpecModulePath.SpecModulePath },\n Table: { relativePath: TableModulePath },\n});\nexport type Declaration = typeof Declaration.Type;\n\nexport const planDeclarations = (\n declarations: Array.NonEmptyReadonlyArray<Declaration>,\n affectedImpls: ReadonlyArray<ImplModulePath>,\n path: Path.Path,\n): {\n readonly tables: ReadonlyArray<TableModule>;\n readonly paths: ReadonlyArray<ImplModulePath>;\n} => {\n const plan = Array.reduce(\n declarations,\n {\n tables: Chunk.empty<TableModule>(),\n paths: HashSet.fromIterable(affectedImpls),\n },\n (state, declaration) =>\n Declaration.match(declaration, {\n Spec: ({ relativePath }) => ({\n ...state,\n paths: HashSet.add(state.paths, SpecModulePath.toImpl(relativePath)),\n }),\n Table: ({ relativePath }) => ({\n ...state,\n tables: Chunk.append(state.tables, {\n relativePath,\n tableName: path.parse(relativePath).name,\n }),\n }),\n }),\n );\n return {\n tables: Chunk.toReadonlyArray(plan.tables),\n paths: Array.fromIterable(plan.paths),\n };\n};\n\nexport type EntryPoint = Kind & {\n readonly absolutePath: string;\n readonly inputPath: string;\n};\nexport type OptionalFile = \"Http\" | \"Crons\" | \"Auth\";\n\nexport const isOptional = Predicate.or(\n Kind.$is(\"Http\"),\n Predicate.or(Kind.$is(\"Crons\"), Kind.$is(\"Auth\")),\n);\n\nexport const parse = (\n relativePath: string,\n): Option.Option<Exclude<Kind, { readonly _tag: \"Config\" }>> => {\n if (relativePath === \"runtime.ts\")\n return Option.some(Kind.Runtime({ relativePath }));\n if (relativePath === \"env.ts\") return Option.some(Kind.Env({ relativePath }));\n if (relativePath === \"app.ts\") return Option.some(Kind.App({ relativePath }));\n if (relativePath === \"callbacks.ts\")\n return Option.some(Kind.Callbacks({ relativePath }));\n if (relativePath === \"http.ts\")\n return Option.some(Kind.Http({ relativePath }));\n if (relativePath === \"crons.ts\")\n return Option.some(Kind.Crons({ relativePath }));\n if (relativePath === \"auth.ts\")\n return Option.some(Kind.Auth({ relativePath }));\n const tablePath = Schema.decodeOption(TableModulePath)(relativePath);\n if (Option.isSome(tablePath))\n return Option.some(Kind.Table({ relativePath: tablePath.value }));\n const specPath = Schema.decodeOption(SpecModulePath.SpecModulePath)(\n relativePath,\n );\n if (Option.isSome(specPath))\n return Option.some(Kind.Spec({ relativePath: specPath.value }));\n return Schema.decodeOption(ImplModulePath)(relativePath).pipe(\n Option.map((implPath) => Kind.Impl({ relativePath: implPath })),\n );\n};\n\nexport const discover = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n\n const tryEntry = Effect.fnUntraced(function* (\n kind: Exclude<Kind, { readonly _tag: \"Config\" }>,\n ) {\n const absolutePath = path.join(confectDirectory, kind.relativePath);\n if (!(yield* fs.exists(absolutePath))) {\n return Option.none<EntryPoint>();\n }\n return Option.some<EntryPoint>({\n ...kind,\n absolutePath,\n inputPath: yield* fs\n .realPath(absolutePath)\n .pipe(Effect.orElseSucceed(() => absolutePath)),\n });\n });\n\n const declaration = yield* tryEntry(Kind.App({ relativePath: \"app.ts\" }));\n const fixedEntryOptions = yield* Effect.all([\n tryEntry(Kind.Env({ relativePath: \"env.ts\" })),\n tryEntry(Kind.Runtime({ relativePath: \"runtime.ts\" })),\n Effect.succeed(declaration),\n (yield* ConvexDirectory.target).kind === \"component\"\n ? tryEntry(Kind.Callbacks({ relativePath: \"callbacks.ts\" }))\n : Effect.succeedNone,\n tryEntry(Kind.Http({ relativePath: \"http.ts\" })),\n tryEntry(Kind.Crons({ relativePath: \"crons.ts\" })),\n tryEntry(Kind.Auth({ relativePath: \"auth.ts\" })),\n ]);\n\n const moduleRelativePaths = yield* Effect.all([\n discoverLeafSpecFiles,\n discoverLeafImplFiles,\n discoverTableFiles,\n ]).pipe(Effect.map(Array.flatten));\n const moduleEntryOptions = yield* Effect.forEach(\n Array.getSomes(moduleRelativePaths.map(parse)),\n tryEntry,\n );\n\n // `convex/convex.config.ts` feeds the generated components registry, so\n // edits to it (or to a locally-defined component definition it imports—npm component definitions are externalized and not watched) must re-run\n // codegen.\n const convexDirectory = yield* ConvexDirectory.get;\n const convexConfigEntryOption = yield* Effect.gen(function* () {\n const absolutePath = path.join(convexDirectory, CONVEX_CONFIG_FILENAME);\n // A declared backend's `convex.config.ts` is codegen output, not input.\n if (Option.isSome(declaration) || !(yield* fs.exists(absolutePath))) {\n return Option.none<EntryPoint>();\n }\n return Option.some<EntryPoint>({\n ...Kind.Config(),\n absolutePath,\n inputPath: yield* fs\n .realPath(absolutePath)\n .pipe(Effect.orElseSucceed(() => absolutePath)),\n });\n });\n\n return Array.getSomes([\n ...fixedEntryOptions,\n convexConfigEntryOption,\n ...moduleEntryOptions,\n ]);\n}).pipe(\n Effect.retry({\n times: 3,\n while: (error) =>\n error._tag === \"PlatformError\" && error.reason._tag === \"NotFound\",\n }),\n);\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAiCA,MAAa,OAAO,KAAK,WAAiB;AAC1C,MAAa,cAAc,OAAO,YAAY;CAC5C,MAAM,EAAE,cAAcA,eAA8B;CACpD,OAAO,EAAE,cAAc,gBAAgB;AACzC,CAAC;AAGD,MAAa,oBACX,cACA,eACA,SAIG;CACH,MAAM,OAAO,MAAM,OACjB,cACA;EACE,QAAQ,MAAM,MAAmB;EACjC,OAAO,QAAQ,aAAa,aAAa;CAC3C,IACC,OAAO,gBACN,YAAY,MAAM,aAAa;EAC7B,OAAO,EAAE,oBAAoB;GAC3B,GAAG;GACH,OAAO,QAAQ,IAAI,MAAM,OAAOC,OAAsB,YAAY,CAAC;EACrE;EACA,QAAQ,EAAE,oBAAoB;GAC5B,GAAG;GACH,QAAQ,MAAM,OAAO,MAAM,QAAQ;IACjC;IACA,WAAW,KAAK,MAAM,YAAY,CAAC,CAAC;GACtC,CAAC;EACH;CACF,CAAC,CACL;CACA,OAAO;EACL,QAAQ,MAAM,gBAAgB,KAAK,MAAM;EACzC,OAAO,MAAM,aAAa,KAAK,KAAK;CACtC;AACF;AAQA,MAAa,aAAa,UAAU,GAClC,KAAK,IAAI,MAAM,GACf,UAAU,GAAG,KAAK,IAAI,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,CAClD;AAEA,MAAa,SACX,iBAC8D;CAC9D,IAAI,iBAAiB,cACnB,OAAO,OAAO,KAAK,KAAK,QAAQ,EAAE,aAAa,CAAC,CAAC;CACnD,IAAI,iBAAiB,UAAU,OAAO,OAAO,KAAK,KAAK,IAAI,EAAE,aAAa,CAAC,CAAC;CAC5E,IAAI,iBAAiB,UAAU,OAAO,OAAO,KAAK,KAAK,IAAI,EAAE,aAAa,CAAC,CAAC;CAC5E,IAAI,iBAAiB,gBACnB,OAAO,OAAO,KAAK,KAAK,UAAU,EAAE,aAAa,CAAC,CAAC;CACrD,IAAI,iBAAiB,WACnB,OAAO,OAAO,KAAK,KAAK,KAAK,EAAE,aAAa,CAAC,CAAC;CAChD,IAAI,iBAAiB,YACnB,OAAO,OAAO,KAAK,KAAK,MAAM,EAAE,aAAa,CAAC,CAAC;CACjD,IAAI,iBAAiB,WACnB,OAAO,OAAO,KAAK,KAAK,KAAK,EAAE,aAAa,CAAC,CAAC;CAChD,MAAM,YAAY,OAAO,aAAa,eAAe,CAAC,CAAC,YAAY;CACnE,IAAI,OAAO,OAAO,SAAS,GACzB,OAAO,OAAO,KAAK,KAAK,MAAM,EAAE,cAAc,UAAU,MAAM,CAAC,CAAC;CAClE,MAAM,WAAW,OAAO,aAAaD,cAA6B,CAAC,CACjE,YACF;CACA,IAAI,OAAO,OAAO,QAAQ,GACxB,OAAO,OAAO,KAAK,KAAK,KAAK,EAAE,cAAc,SAAS,MAAM,CAAC,CAAC;CAChE,OAAO,OAAO,aAAa,cAAc,CAAC,CAAC,YAAY,CAAC,CAAC,KACvD,OAAO,KAAK,aAAa,KAAK,KAAK,EAAE,cAAc,SAAS,CAAC,CAAC,CAChE;AACF;AAEA,MAAa,WAAW,OAAO,IAAI,aAAa;CAC9C,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,mBAAmB,OAAO,iBAAiB;CAEjD,MAAM,WAAW,OAAO,WAAW,WACjC,MACA;EACA,MAAM,eAAe,KAAK,KAAK,kBAAkB,KAAK,YAAY;EAClE,IAAI,EAAE,OAAO,GAAG,OAAO,YAAY,IACjC,OAAO,OAAO,KAAiB;EAEjC,OAAO,OAAO,KAAiB;GAC7B,GAAG;GACH;GACA,WAAW,OAAO,GACf,SAAS,YAAY,CAAC,CACtB,KAAK,OAAO,oBAAoB,YAAY,CAAC;EAClD,CAAC;CACH,CAAC;CAED,MAAM,cAAc,OAAO,SAAS,KAAK,IAAI,EAAE,cAAc,SAAS,CAAC,CAAC;CACxE,MAAM,oBAAoB,OAAO,OAAO,IAAI;EAC1C,SAAS,KAAK,IAAI,EAAE,cAAc,SAAS,CAAC,CAAC;EAC7C,SAAS,KAAK,QAAQ,EAAE,cAAc,aAAa,CAAC,CAAC;EACrD,OAAO,QAAQ,WAAW;GACzB,OAAO,gBAAgB,OAAA,CAAQ,SAAS,cACrC,SAAS,KAAK,UAAU,EAAE,cAAc,eAAe,CAAC,CAAC,IACzD,OAAO;EACX,SAAS,KAAK,KAAK,EAAE,cAAc,UAAU,CAAC,CAAC;EAC/C,SAAS,KAAK,MAAM,EAAE,cAAc,WAAW,CAAC,CAAC;EACjD,SAAS,KAAK,KAAK,EAAE,cAAc,UAAU,CAAC,CAAC;CACjD,CAAC;CAED,MAAM,sBAAsB,OAAO,OAAO,IAAI;EAC5C;EACA;EACA;CACF,CAAC,CAAC,CAAC,KAAK,OAAO,IAAI,MAAM,OAAO,CAAC;CACjC,MAAM,qBAAqB,OAAO,OAAO,QACvC,MAAM,SAAS,oBAAoB,IAAI,KAAK,CAAC,GAC7C,QACF;CAKA,MAAM,kBAAkB,OAAO,gBAAgB;CAC/C,MAAM,0BAA0B,OAAO,OAAO,IAAI,aAAa;EAC7D,MAAM,eAAe,KAAK,KAAK,iBAAiB,sBAAsB;EAEtE,IAAI,OAAO,OAAO,WAAW,KAAK,EAAE,OAAO,GAAG,OAAO,YAAY,IAC/D,OAAO,OAAO,KAAiB;EAEjC,OAAO,OAAO,KAAiB;GAC7B,GAAG,KAAK,OAAO;GACf;GACA,WAAW,OAAO,GACf,SAAS,YAAY,CAAC,CACtB,KAAK,OAAO,oBAAoB,YAAY,CAAC;EAClD,CAAC;CACH,CAAC;CAED,OAAO,MAAM,SAAS;EACpB,GAAG;EACH;EACA,GAAG;CACL,CAAC;AACH,CAAC,CAAC,CAAC,KACD,OAAO,MAAM;CACX,OAAO;CACP,QAAQ,UACN,MAAM,SAAS,mBAAmB,MAAM,OAAO,SAAS;AAC5D,CAAC,CACH"}
|
package/dist/Evaluation.mjs
CHANGED
|
@@ -12,11 +12,13 @@ import * as Path from "effect/Path";
|
|
|
12
12
|
import * as HashSet from "effect/HashSet";
|
|
13
13
|
import * as Match from "effect/Match";
|
|
14
14
|
import * as Option from "effect/Option";
|
|
15
|
+
import * as Context from "effect/Context";
|
|
15
16
|
import * as Schema from "effect/Schema";
|
|
16
17
|
import * as Console from "effect/Console";
|
|
17
18
|
import * as Layer from "effect/Layer";
|
|
18
19
|
import * as NodeWorker from "@effect/platform-node/NodeWorker";
|
|
19
20
|
import { fork } from "node:child_process";
|
|
21
|
+
import * as Pool from "effect/Pool";
|
|
20
22
|
import * as LogLevel from "effect/LogLevel";
|
|
21
23
|
import * as References from "effect/References";
|
|
22
24
|
import * as Rpc from "effect/rpc/Rpc";
|
|
@@ -35,7 +37,7 @@ const RequestContext = Schema.Struct({
|
|
|
35
37
|
});
|
|
36
38
|
var EvaluationError = class extends Schema.TaggedError()("EvaluationError", { diagnostic: Schema.String }) {};
|
|
37
39
|
const Failure = Schema.Union([EvaluationError, ComponentNodeGroupError]);
|
|
38
|
-
const requests = RpcGroup.make(Rpc.make("Previous", {
|
|
40
|
+
const requests = RpcGroup.make(Rpc.make("Ready", { success: Schema.Void }), Rpc.make("Previous", {
|
|
39
41
|
payload: RequestContext,
|
|
40
42
|
success: FunctionPaths,
|
|
41
43
|
error: Failure
|
|
@@ -60,6 +62,29 @@ const requests = RpcGroup.make(Rpc.make("Previous", {
|
|
|
60
62
|
success: GenerationSnapshot,
|
|
61
63
|
error: Failure
|
|
62
64
|
}));
|
|
65
|
+
const acquireWorker = Effect.gen(function* () {
|
|
66
|
+
const child = yield* Effect.acquireRelease(Effect.sync(() => fork(new URL("../dist/EvaluationWorker.mjs", import.meta.url), { serialization: "advanced" })), (evaluator) => Effect.callback((resume) => {
|
|
67
|
+
if (evaluator.exitCode !== null || evaluator.signalCode !== null) {
|
|
68
|
+
resume(Effect.void);
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
evaluator.once("exit", () => resume(Effect.void));
|
|
72
|
+
evaluator.kill("SIGKILL");
|
|
73
|
+
}));
|
|
74
|
+
const protocol = yield* Layer.build(RpcClient.layerProtocolWorker({ size: 1 }).pipe(Layer.provide(NodeWorker.layer(() => child))));
|
|
75
|
+
const client = yield* RpcClient.make(requests).pipe(Effect.provideContext(protocol));
|
|
76
|
+
yield* client.Ready();
|
|
77
|
+
yield* Effect.logDebug("Evaluator ready").pipe(Effect.annotateLogs({ pid: child.pid }));
|
|
78
|
+
return {
|
|
79
|
+
child,
|
|
80
|
+
client
|
|
81
|
+
};
|
|
82
|
+
});
|
|
83
|
+
var Standby = class extends Context.Service()("@confect/cli/Evaluation/Standby") {};
|
|
84
|
+
const prewarmedLayer = Layer.effect(Standby, Pool.make({
|
|
85
|
+
acquire: acquireWorker,
|
|
86
|
+
size: 1
|
|
87
|
+
}));
|
|
63
88
|
const withWorker = Effect.fn("Evaluation.withWorker")(function* (run) {
|
|
64
89
|
const requestContext = {
|
|
65
90
|
projectRoot: yield* ProjectRoot.get,
|
|
@@ -72,17 +97,18 @@ const withWorker = Effect.fn("Evaluation.withWorker")(function* (run) {
|
|
|
72
97
|
minimumLogLevel: yield* References.MinimumLogLevel
|
|
73
98
|
};
|
|
74
99
|
return yield* Effect.scoped(Effect.gen(function* () {
|
|
75
|
-
const
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
100
|
+
const standby = yield* Effect.serviceOption(Standby);
|
|
101
|
+
return yield* run((yield* Option.match(standby, {
|
|
102
|
+
onNone: () => acquireWorker,
|
|
103
|
+
onSome: (pool) => Effect.gen(function* () {
|
|
104
|
+
while (true) {
|
|
105
|
+
const candidate = yield* Pool.get(pool);
|
|
106
|
+
yield* Effect.addFinalizer(() => Pool.invalidate(pool, candidate));
|
|
107
|
+
if (candidate.child.connected && candidate.child.exitCode === null && candidate.child.signalCode === null) return candidate;
|
|
108
|
+
yield* Pool.invalidate(pool, candidate);
|
|
109
|
+
}
|
|
110
|
+
})
|
|
111
|
+
})).client, requestContext);
|
|
86
112
|
})).pipe(Effect.catchTags({
|
|
87
113
|
WorkerError: (error) => Effect.fail(new EvaluationError({ diagnostic: error.message })),
|
|
88
114
|
RpcClientError: (error) => Effect.fail(new EvaluationError({ diagnostic: error.message }))
|
|
@@ -112,6 +138,6 @@ const catchAndLog = (effect) => effect.pipe(Effect.asSome, Effect.catchTags({
|
|
|
112
138
|
ComponentNodeGroupError: (error) => logCodegenError(error).pipe(Effect.as(Option.none()))
|
|
113
139
|
}));
|
|
114
140
|
//#endregion
|
|
115
|
-
export { EvaluationError, RequestContext, catchAndLog, generateSnapshot, loadPreviousFunctionPaths, requests, updateDeclarations, validate };
|
|
141
|
+
export { EvaluationError, RequestContext, catchAndLog, generateSnapshot, loadPreviousFunctionPaths, prewarmedLayer, requests, updateDeclarations, validate };
|
|
116
142
|
|
|
117
143
|
//# sourceMappingURL=Evaluation.mjs.map
|
package/dist/Evaluation.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Evaluation.mjs","names":["GenerationSnapshot.GenerationSnapshot","EntryPoint.Declaration","GenerationSnapshot.functionPaths"],"sources":["../src/Evaluation.ts"],"sourcesContent":["import * as NodeWorker from \"@effect/platform-node/NodeWorker\";\nimport { fork } from \"node:child_process\";\nimport * as Console from \"effect/Console\";\nimport * as Effect from \"effect/Effect\";\nimport * as FileSystem from \"effect/FileSystem\";\nimport * as HashSet from \"effect/HashSet\";\nimport * as Layer from \"effect/Layer\";\nimport * as LogLevel from \"effect/LogLevel\";\nimport * as Option from \"effect/Option\";\nimport * as Path from \"effect/Path\";\nimport * as Schema from \"effect/Schema\";\nimport * as References from \"effect/References\";\nimport * as Rpc from \"effect/rpc/Rpc\";\nimport * as RpcClient from \"effect/rpc/RpcClient\";\nimport type { RpcClientError } from \"effect/rpc/RpcClientError\";\nimport * as RpcGroup from \"effect/rpc/RpcGroup\";\nimport type * as Array from \"effect/Array\";\nimport * as Match from \"effect/Match\";\nimport { ComponentNodeGroupError, logCodegenError } from \"./CodegenError.js\";\nimport * as EntryPoint from \"./EntryPoint.js\";\nimport * as GenerationSnapshot from \"./GenerationSnapshot.js\";\nimport { ConfectDirectory } from \"./ConfectDirectory.js\";\nimport { ConvexDirectory } from \"./ConvexDirectory.js\";\nimport { FunctionPaths } from \"./FunctionPaths.js\";\nimport { ImplModulePath } from \"./ImplModulePath.js\";\nimport { ProjectRoot } from \"./ProjectRoot.js\";\n\nexport const RequestContext = Schema.Struct({\n projectRoot: Schema.String,\n confectDirectory: Schema.String,\n convexDirectory: Schema.String,\n target: Schema.Union([\n Schema.Struct({ kind: Schema.Literal(\"app\") }),\n Schema.Struct({\n kind: Schema.Literal(\"component\"),\n definition: Schema.String,\n }),\n ]),\n minimumLogLevel: Schema.Literals(LogLevel.values),\n});\nexport type RequestContext = typeof RequestContext.Type;\n\nexport class EvaluationError extends Schema.TaggedError<EvaluationError>()(\n \"EvaluationError\",\n { diagnostic: Schema.String },\n) {}\n\n// A rejected Node group stays typed so the caller can restore component output.\nconst Failure = Schema.Union([EvaluationError, ComponentNodeGroupError]);\n\nexport const requests = RpcGroup.make(\n Rpc.make(\"Previous\", {\n payload: RequestContext,\n success: FunctionPaths,\n error: Failure,\n }),\n Rpc.make(\"Generate\", {\n payload: RequestContext,\n success: GenerationSnapshot.GenerationSnapshot,\n error: Failure,\n }),\n Rpc.make(\"Validate\", {\n payload: Schema.Struct({\n ...RequestContext.fields,\n paths: Schema.Array(ImplModulePath),\n }),\n success: Schema.Void,\n error: Failure,\n }),\n Rpc.make(\"Update\", {\n payload: Schema.Struct({\n ...RequestContext.fields,\n snapshot: GenerationSnapshot.GenerationSnapshot,\n declarations: Schema.NonEmptyArray(EntryPoint.Declaration),\n paths: Schema.Array(ImplModulePath),\n }),\n success: GenerationSnapshot.GenerationSnapshot,\n error: Failure,\n }),\n);\n\nconst withWorker = Effect.fn(\"Evaluation.withWorker\")(function* <A>(\n run: (\n client: RpcClient.RpcClient<RpcGroup.Rpcs<typeof requests>, RpcClientError>,\n requestContext: RequestContext,\n ) => Effect.Effect<\n A,\n EvaluationError | ComponentNodeGroupError | RpcClientError\n >,\n) {\n const requestContext = {\n projectRoot: yield* ProjectRoot.get,\n confectDirectory: yield* ConfectDirectory.get,\n convexDirectory: yield* ConvexDirectory.get,\n target: Match.value(yield* ConvexDirectory.target).pipe(\n Match.when({ kind: \"app\" }, () => ({ kind: \"app\" as const })),\n Match.when({ kind: \"component\" }, ({ scope }) => ({\n kind: \"component\" as const,\n definition: scope.slice(\"component:\".length),\n })),\n Match.exhaustive,\n ),\n minimumLogLevel: yield* References.MinimumLogLevel,\n };\n return yield* Effect.scoped(\n Effect.gen(function* () {\n const child = yield* Effect.acquireRelease(\n Effect.sync(() =>\n fork(new URL(\"../dist/EvaluationWorker.mjs\", import.meta.url), {\n serialization: \"advanced\",\n }),\n ),\n (evaluator) =>\n Effect.callback<void>((resume) => {\n if (evaluator.exitCode !== null || evaluator.signalCode !== null) {\n resume(Effect.void);\n return;\n }\n evaluator.once(\"exit\", () => resume(Effect.void));\n evaluator.kill(\"SIGKILL\");\n }),\n );\n return yield* Effect.gen(function* () {\n const client = yield* RpcClient.make(requests);\n return yield* run(client, requestContext);\n }).pipe(\n Effect.provide(\n RpcClient.layerProtocolWorker({ size: 1 }).pipe(\n Layer.provide(NodeWorker.layer(() => child)),\n ),\n ),\n );\n }),\n ).pipe(\n Effect.catchTags({\n WorkerError: (error) =>\n Effect.fail(new EvaluationError({ diagnostic: error.message })),\n RpcClientError: (error) =>\n Effect.fail(new EvaluationError({ diagnostic: error.message })),\n }),\n );\n});\n\nexport const loadPreviousFunctionPaths = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n if (\n !(yield* fs.exists(path.join(confectDirectory, \"_generated\", \"spec.ts\")))\n ) {\n return FunctionPaths.make(HashSet.empty());\n }\n return yield* withWorker((client, requestContext) =>\n client.Previous(requestContext),\n );\n});\n\nexport const generateSnapshot = withWorker((client, requestContext) =>\n client.Generate(requestContext),\n);\n\nexport const generate = generateSnapshot.pipe(\n Effect.map(GenerationSnapshot.functionPaths),\n);\n\nexport const updateDeclarations = (\n snapshot: GenerationSnapshot.GenerationSnapshot,\n declarations: Array.NonEmptyReadonlyArray<EntryPoint.Declaration>,\n paths: ReadonlyArray<ImplModulePath>,\n) =>\n withWorker((client, requestContext) =>\n client.Update({\n ...requestContext,\n snapshot,\n declarations,\n paths,\n }),\n );\n\nexport const validate = (paths: ReadonlyArray<ImplModulePath>) =>\n withWorker((client, requestContext) =>\n client.Validate({ ...requestContext, paths }),\n );\n\nexport const catchAndLog = <A, R>(\n effect: Effect.Effect<A, EvaluationError | ComponentNodeGroupError, R>,\n): Effect.Effect<Option.Option<A>, never, R> =>\n effect.pipe(\n Effect.asSome,\n Effect.catchTags({\n EvaluationError: ({ diagnostic }) =>\n Console.error(diagnostic).pipe(Effect.as(Option.none<A>())),\n ComponentNodeGroupError: (error) =>\n logCodegenError(error).pipe(Effect.as(Option.none<A>())),\n }),\n );\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Evaluation.mjs","names":["GenerationSnapshot.GenerationSnapshot","EntryPoint.Declaration","GenerationSnapshot.functionPaths"],"sources":["../src/Evaluation.ts"],"sourcesContent":["import * as NodeWorker from \"@effect/platform-node/NodeWorker\";\nimport { fork } from \"node:child_process\";\nimport * as Console from \"effect/Console\";\nimport * as Context from \"effect/Context\";\nimport * as Pool from \"effect/Pool\";\nimport * as Effect from \"effect/Effect\";\nimport * as FileSystem from \"effect/FileSystem\";\nimport * as HashSet from \"effect/HashSet\";\nimport * as Layer from \"effect/Layer\";\nimport * as LogLevel from \"effect/LogLevel\";\nimport * as Option from \"effect/Option\";\nimport * as Path from \"effect/Path\";\nimport * as Schema from \"effect/Schema\";\nimport * as References from \"effect/References\";\nimport * as Rpc from \"effect/rpc/Rpc\";\nimport * as RpcClient from \"effect/rpc/RpcClient\";\nimport type { RpcClientError } from \"effect/rpc/RpcClientError\";\nimport * as RpcGroup from \"effect/rpc/RpcGroup\";\nimport type * as Array from \"effect/Array\";\nimport * as Match from \"effect/Match\";\nimport { ComponentNodeGroupError, logCodegenError } from \"./CodegenError.js\";\nimport * as EntryPoint from \"./EntryPoint.js\";\nimport * as GenerationSnapshot from \"./GenerationSnapshot.js\";\nimport { ConfectDirectory } from \"./ConfectDirectory.js\";\nimport { ConvexDirectory } from \"./ConvexDirectory.js\";\nimport { FunctionPaths } from \"./FunctionPaths.js\";\nimport { ImplModulePath } from \"./ImplModulePath.js\";\nimport { ProjectRoot } from \"./ProjectRoot.js\";\n\nexport const RequestContext = Schema.Struct({\n projectRoot: Schema.String,\n confectDirectory: Schema.String,\n convexDirectory: Schema.String,\n target: Schema.Union([\n Schema.Struct({ kind: Schema.Literal(\"app\") }),\n Schema.Struct({\n kind: Schema.Literal(\"component\"),\n definition: Schema.String,\n }),\n ]),\n minimumLogLevel: Schema.Literals(LogLevel.values),\n});\nexport type RequestContext = typeof RequestContext.Type;\n\nexport class EvaluationError extends Schema.TaggedError<EvaluationError>()(\n \"EvaluationError\",\n { diagnostic: Schema.String },\n) {}\n\n// A rejected Node group stays typed so the caller can restore component output.\nconst Failure = Schema.Union([EvaluationError, ComponentNodeGroupError]);\n\nexport const requests = RpcGroup.make(\n Rpc.make(\"Ready\", { success: Schema.Void }),\n Rpc.make(\"Previous\", {\n payload: RequestContext,\n success: FunctionPaths,\n error: Failure,\n }),\n Rpc.make(\"Generate\", {\n payload: RequestContext,\n success: GenerationSnapshot.GenerationSnapshot,\n error: Failure,\n }),\n Rpc.make(\"Validate\", {\n payload: Schema.Struct({\n ...RequestContext.fields,\n paths: Schema.Array(ImplModulePath),\n }),\n success: Schema.Void,\n error: Failure,\n }),\n Rpc.make(\"Update\", {\n payload: Schema.Struct({\n ...RequestContext.fields,\n snapshot: GenerationSnapshot.GenerationSnapshot,\n declarations: Schema.NonEmptyArray(EntryPoint.Declaration),\n paths: Schema.Array(ImplModulePath),\n }),\n success: GenerationSnapshot.GenerationSnapshot,\n error: Failure,\n }),\n);\n\nconst acquireWorker = Effect.gen(function* () {\n const child = yield* Effect.acquireRelease(\n Effect.sync(() =>\n fork(new URL(\"../dist/EvaluationWorker.mjs\", import.meta.url), {\n serialization: \"advanced\",\n }),\n ),\n (evaluator) =>\n Effect.callback<void>((resume) => {\n if (evaluator.exitCode !== null || evaluator.signalCode !== null) {\n resume(Effect.void);\n return;\n }\n evaluator.once(\"exit\", () => resume(Effect.void));\n evaluator.kill(\"SIGKILL\");\n }),\n );\n const protocol = yield* Layer.build(\n RpcClient.layerProtocolWorker({ size: 1 }).pipe(\n Layer.provide(NodeWorker.layer(() => child)),\n ),\n );\n const client = yield* RpcClient.make(requests).pipe(\n Effect.provideContext(protocol),\n );\n yield* client.Ready();\n yield* Effect.logDebug(\"Evaluator ready\").pipe(\n Effect.annotateLogs({ pid: child.pid }),\n );\n return { child, client };\n});\n\nclass Standby extends Context.Service<\n Standby,\n Pool.Pool<\n Effect.Success<typeof acquireWorker>,\n Effect.Error<typeof acquireWorker>\n >\n>()(\"@confect/cli/Evaluation/Standby\") {}\n\n// Each evaluator handles one evaluation to isolate globals and module caches.\n// Discarding it bounds memory and recovers from crashes. Dev prepares the next\n// evaluator between saves.\nexport const prewarmedLayer = Layer.effect(\n Standby,\n Pool.make({ acquire: acquireWorker, size: 1 }),\n);\n\nconst withWorker = Effect.fn(\"Evaluation.withWorker\")(function* <A>(\n run: (\n client: RpcClient.RpcClient<RpcGroup.Rpcs<typeof requests>, RpcClientError>,\n requestContext: RequestContext,\n ) => Effect.Effect<\n A,\n EvaluationError | ComponentNodeGroupError | RpcClientError\n >,\n) {\n const requestContext = {\n projectRoot: yield* ProjectRoot.get,\n confectDirectory: yield* ConfectDirectory.get,\n convexDirectory: yield* ConvexDirectory.get,\n target: Match.value(yield* ConvexDirectory.target).pipe(\n Match.when({ kind: \"app\" }, () => ({ kind: \"app\" as const })),\n Match.when({ kind: \"component\" }, ({ scope }) => ({\n kind: \"component\" as const,\n definition: scope.slice(\"component:\".length),\n })),\n Match.exhaustive,\n ),\n minimumLogLevel: yield* References.MinimumLogLevel,\n };\n return yield* Effect.scoped(\n Effect.gen(function* () {\n const standby = yield* Effect.serviceOption(Standby);\n const worker = yield* Option.match(standby, {\n onNone: () => acquireWorker,\n onSome: (pool) =>\n Effect.gen(function* () {\n while (true) {\n const candidate = yield* Pool.get(pool);\n yield* Effect.addFinalizer(() =>\n Pool.invalidate(pool, candidate),\n );\n // An idle exit has no pending RPC to fail.\n if (\n candidate.child.connected &&\n candidate.child.exitCode === null &&\n candidate.child.signalCode === null\n )\n return candidate;\n yield* Pool.invalidate(pool, candidate);\n }\n }),\n });\n return yield* run(worker.client, requestContext);\n }),\n ).pipe(\n Effect.catchTags({\n WorkerError: (error) =>\n Effect.fail(new EvaluationError({ diagnostic: error.message })),\n RpcClientError: (error) =>\n Effect.fail(new EvaluationError({ diagnostic: error.message })),\n }),\n );\n});\n\nexport const loadPreviousFunctionPaths = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n if (\n !(yield* fs.exists(path.join(confectDirectory, \"_generated\", \"spec.ts\")))\n ) {\n return FunctionPaths.make(HashSet.empty());\n }\n return yield* withWorker((client, requestContext) =>\n client.Previous(requestContext),\n );\n});\n\nexport const generateSnapshot = withWorker((client, requestContext) =>\n client.Generate(requestContext),\n);\n\nexport const generate = generateSnapshot.pipe(\n Effect.map(GenerationSnapshot.functionPaths),\n);\n\nexport const updateDeclarations = (\n snapshot: GenerationSnapshot.GenerationSnapshot,\n declarations: Array.NonEmptyReadonlyArray<EntryPoint.Declaration>,\n paths: ReadonlyArray<ImplModulePath>,\n) =>\n withWorker((client, requestContext) =>\n client.Update({\n ...requestContext,\n snapshot,\n declarations,\n paths,\n }),\n );\n\nexport const validate = (paths: ReadonlyArray<ImplModulePath>) =>\n withWorker((client, requestContext) =>\n client.Validate({ ...requestContext, paths }),\n );\n\nexport const catchAndLog = <A, R>(\n effect: Effect.Effect<A, EvaluationError | ComponentNodeGroupError, R>,\n): Effect.Effect<Option.Option<A>, never, R> =>\n effect.pipe(\n Effect.asSome,\n Effect.catchTags({\n EvaluationError: ({ diagnostic }) =>\n Console.error(diagnostic).pipe(Effect.as(Option.none<A>())),\n ComponentNodeGroupError: (error) =>\n logCodegenError(error).pipe(Effect.as(Option.none<A>())),\n }),\n );\n"],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ import * as Schema from "effect/Schema";
|
|
|
15
15
|
import * as esbuild from "esbuild";
|
|
16
16
|
import * as Layer from "effect/Layer";
|
|
17
17
|
import * as IdScope from "@confect/core/IdScope";
|
|
18
|
+
import * as Schedule from "effect/Schedule";
|
|
18
19
|
import * as References from "effect/References";
|
|
19
20
|
import * as NodeWorkerRunner from "@effect/platform-node/NodeWorkerRunner";
|
|
20
21
|
import * as RpcServer from "effect/rpc/RpcServer";
|
|
@@ -34,12 +35,23 @@ const evaluate = (requestContext, effect) => effect.pipe(Effect.provideService(R
|
|
|
34
35
|
return Effect.fail(new EvaluationError({ diagnostic: Option.isSome(failure) && isCodegenError(failure.value) ? renderCodegenError(failure.value) : Cause.pretty(cause) }));
|
|
35
36
|
}));
|
|
36
37
|
const handlers = requests.toLayer({
|
|
38
|
+
Ready: () => Effect.void,
|
|
37
39
|
Previous: (requestContext) => evaluate(requestContext, loadPreviousFunctionPaths),
|
|
38
40
|
Generate: (requestContext) => evaluate(requestContext, generateWithSnapshot.pipe(Effect.map(({ snapshot }) => snapshot))),
|
|
39
41
|
Validate: (request) => evaluate(request, validateImplFiles(request.paths)),
|
|
40
42
|
Update: (request) => evaluate(request, updateDeclarations(request.snapshot, request.declarations, request.paths))
|
|
41
43
|
});
|
|
42
|
-
|
|
44
|
+
const parentPid = process.ppid;
|
|
45
|
+
process.once("disconnect", () => process.exit(0));
|
|
46
|
+
const watchParent = Effect.sync(() => {
|
|
47
|
+
if (!process.connected || process.ppid !== parentPid) process.exit(0);
|
|
48
|
+
try {
|
|
49
|
+
process.kill(parentPid, 0);
|
|
50
|
+
} catch {
|
|
51
|
+
process.exit(0);
|
|
52
|
+
}
|
|
53
|
+
}).pipe(Effect.repeat({ schedule: Schedule.spaced("1 second") }));
|
|
54
|
+
RpcServer.layer(requests).pipe(Layer.provide(handlers), Layer.provide(NodeServices.layer), Layer.provide(RpcServer.layerProtocolWorkerRunner.pipe(Layer.provide(NodeWorkerRunner.layer))), Layer.launch, Effect.raceFirst(watchParent), Effect.ensuring(Effect.promise(() => esbuild.stop())), NodeRuntime.runMain);
|
|
43
55
|
//#endregion
|
|
44
56
|
export {};
|
|
45
57
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvaluationWorker.mjs","names":["CodegenError.ComponentNodeGroupError","CodegenError.isCodegenError","CodegenError.renderCodegenError"],"sources":["../src/EvaluationWorker.ts"],"sourcesContent":["import * as NodeRuntime from \"@effect/platform-node/NodeRuntime\";\nimport * as NodeServices from \"@effect/platform-node/NodeServices\";\nimport * as NodeWorkerRunner from \"@effect/platform-node/NodeWorkerRunner\";\nimport * as IdScope from \"@confect/core/IdScope\";\nimport * as Cause from \"effect/Cause\";\nimport * as Effect from \"effect/Effect\";\nimport * as Layer from \"effect/Layer\";\nimport * as Match from \"effect/Match\";\nimport * as Option from \"effect/Option\";\nimport * as References from \"effect/References\";\nimport * as Schema from \"effect/Schema\";\nimport * as RpcServer from \"effect/rpc/RpcServer\";\nimport * as esbuild from \"esbuild\";\nimport * as CodegenError from \"./CodegenError.js\";\nimport { ConfectDirectory } from \"./ConfectDirectory.js\";\nimport { ConvexDirectory } from \"./ConvexDirectory.js\";\nimport type { RequestContext } from \"./Evaluation.js\";\nimport { EvaluationError, requests } from \"./Evaluation.js\";\nimport { validateImplFiles } from \"./LeafModule.js\";\nimport { ProjectRoot } from \"./ProjectRoot.js\";\nimport {\n generateWithSnapshot,\n loadPreviousFunctionPaths,\n updateDeclarations,\n} from \"./confect/codegen.js\";\n\nconst evaluate = <A, E, R>(\n requestContext: RequestContext,\n effect: Effect.Effect<A, E, R>,\n) =>\n effect.pipe(\n Effect.provideService(\n References.MinimumLogLevel,\n requestContext.minimumLogLevel,\n ),\n Effect.provideService(ProjectRoot, {\n get: Effect.succeed(requestContext.projectRoot),\n }),\n Effect.provideService(ConfectDirectory, {\n get: Effect.succeed(requestContext.confectDirectory),\n }),\n Effect.provideService(ConvexDirectory, {\n get: Effect.succeed(requestContext.convexDirectory),\n target: Match.value(requestContext.target).pipe(\n Match.when({ kind: \"app\" }, () => ({\n kind: \"app\" as const,\n scope: IdScope.app,\n })),\n Match.when({ kind: \"component\" }, ({ definition }) => ({\n kind: \"component\" as const,\n scope: IdScope.component(definition),\n })),\n Match.exhaustive,\n ),\n }),\n Effect.catchCause(\n (\n cause,\n ): Effect.Effect<\n never,\n EvaluationError | CodegenError.ComponentNodeGroupError\n > => {\n const failure = Cause.findErrorOption(cause);\n if (\n Option.isSome(failure) &&\n Schema.is(CodegenError.ComponentNodeGroupError)(failure.value)\n )\n return Effect.fail(failure.value);\n return Effect.fail(\n new EvaluationError({\n diagnostic:\n Option.isSome(failure) &&\n CodegenError.isCodegenError(failure.value)\n ? CodegenError.renderCodegenError(failure.value)\n : Cause.pretty(cause),\n }),\n );\n },\n ),\n );\n\nconst handlers = requests.toLayer({\n Previous: (requestContext) =>\n evaluate(requestContext, loadPreviousFunctionPaths),\n Generate: (requestContext) =>\n evaluate(\n requestContext,\n generateWithSnapshot.pipe(Effect.map(({ snapshot }) => snapshot)),\n ),\n Validate: (request) => evaluate(request, validateImplFiles(request.paths)),\n Update: (request) =>\n evaluate(\n request,\n updateDeclarations(request.snapshot, request.declarations, request.paths),\n ),\n});\n\nRpcServer.layer(requests).pipe(\n Layer.provide(handlers),\n Layer.provide(NodeServices.layer),\n Layer.provide(\n RpcServer.layerProtocolWorkerRunner.pipe(\n Layer.provide(NodeWorkerRunner.layer),\n ),\n ),\n Layer.launch,\n Effect.ensuring(Effect.promise(() => esbuild.stop())),\n NodeRuntime.runMain,\n);\n"],"mappings":"
|
|
1
|
+
{"version":3,"file":"EvaluationWorker.mjs","names":["CodegenError.ComponentNodeGroupError","CodegenError.isCodegenError","CodegenError.renderCodegenError"],"sources":["../src/EvaluationWorker.ts"],"sourcesContent":["import * as NodeRuntime from \"@effect/platform-node/NodeRuntime\";\nimport * as NodeServices from \"@effect/platform-node/NodeServices\";\nimport * as NodeWorkerRunner from \"@effect/platform-node/NodeWorkerRunner\";\nimport * as IdScope from \"@confect/core/IdScope\";\nimport * as Cause from \"effect/Cause\";\nimport * as Effect from \"effect/Effect\";\nimport * as Layer from \"effect/Layer\";\nimport * as Match from \"effect/Match\";\nimport * as Option from \"effect/Option\";\nimport * as References from \"effect/References\";\nimport * as Schema from \"effect/Schema\";\nimport * as Schedule from \"effect/Schedule\";\nimport * as RpcServer from \"effect/rpc/RpcServer\";\nimport * as esbuild from \"esbuild\";\nimport * as CodegenError from \"./CodegenError.js\";\nimport { ConfectDirectory } from \"./ConfectDirectory.js\";\nimport { ConvexDirectory } from \"./ConvexDirectory.js\";\nimport type { RequestContext } from \"./Evaluation.js\";\nimport { EvaluationError, requests } from \"./Evaluation.js\";\nimport { validateImplFiles } from \"./LeafModule.js\";\nimport { ProjectRoot } from \"./ProjectRoot.js\";\nimport {\n generateWithSnapshot,\n loadPreviousFunctionPaths,\n updateDeclarations,\n} from \"./confect/codegen.js\";\n\nconst evaluate = <A, E, R>(\n requestContext: RequestContext,\n effect: Effect.Effect<A, E, R>,\n) =>\n effect.pipe(\n Effect.provideService(\n References.MinimumLogLevel,\n requestContext.minimumLogLevel,\n ),\n Effect.provideService(ProjectRoot, {\n get: Effect.succeed(requestContext.projectRoot),\n }),\n Effect.provideService(ConfectDirectory, {\n get: Effect.succeed(requestContext.confectDirectory),\n }),\n Effect.provideService(ConvexDirectory, {\n get: Effect.succeed(requestContext.convexDirectory),\n target: Match.value(requestContext.target).pipe(\n Match.when({ kind: \"app\" }, () => ({\n kind: \"app\" as const,\n scope: IdScope.app,\n })),\n Match.when({ kind: \"component\" }, ({ definition }) => ({\n kind: \"component\" as const,\n scope: IdScope.component(definition),\n })),\n Match.exhaustive,\n ),\n }),\n Effect.catchCause(\n (\n cause,\n ): Effect.Effect<\n never,\n EvaluationError | CodegenError.ComponentNodeGroupError\n > => {\n const failure = Cause.findErrorOption(cause);\n if (\n Option.isSome(failure) &&\n Schema.is(CodegenError.ComponentNodeGroupError)(failure.value)\n )\n return Effect.fail(failure.value);\n return Effect.fail(\n new EvaluationError({\n diagnostic:\n Option.isSome(failure) &&\n CodegenError.isCodegenError(failure.value)\n ? CodegenError.renderCodegenError(failure.value)\n : Cause.pretty(cause),\n }),\n );\n },\n ),\n );\n\nconst handlers = requests.toLayer({\n Ready: () => Effect.void,\n Previous: (requestContext) =>\n evaluate(requestContext, loadPreviousFunctionPaths),\n Generate: (requestContext) =>\n evaluate(\n requestContext,\n generateWithSnapshot.pipe(Effect.map(({ snapshot }) => snapshot)),\n ),\n Validate: (request) => evaluate(request, validateImplFiles(request.paths)),\n Update: (request) =>\n evaluate(\n request,\n updateDeclarations(request.snapshot, request.declarations, request.paths),\n ),\n});\n\n// Evaluators must not outlive the CLI, even when it is killed without cleanup.\nconst parentPid = process.ppid;\nprocess.once(\"disconnect\", () => process.exit(0));\nconst watchParent = Effect.sync(() => {\n if (!process.connected || process.ppid !== parentPid) process.exit(0);\n try {\n process.kill(parentPid, 0);\n } catch {\n process.exit(0);\n }\n}).pipe(Effect.repeat({ schedule: Schedule.spaced(\"1 second\") }));\n\nRpcServer.layer(requests).pipe(\n Layer.provide(handlers),\n Layer.provide(NodeServices.layer),\n Layer.provide(\n RpcServer.layerProtocolWorkerRunner.pipe(\n Layer.provide(NodeWorkerRunner.layer),\n ),\n ),\n Layer.launch,\n Effect.raceFirst(watchParent),\n Effect.ensuring(Effect.promise(() => esbuild.stop())),\n NodeRuntime.runMain,\n);\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AA2BA,MAAM,YACJ,gBACA,WAEA,OAAO,KACL,OAAO,eACL,WAAW,iBACX,eAAe,eACjB,GACA,OAAO,eAAe,aAAa,EACjC,KAAK,OAAO,QAAQ,eAAe,WAAW,EAChD,CAAC,GACD,OAAO,eAAe,kBAAkB,EACtC,KAAK,OAAO,QAAQ,eAAe,gBAAgB,EACrD,CAAC,GACD,OAAO,eAAe,iBAAiB;CACrC,KAAK,OAAO,QAAQ,eAAe,eAAe;CAClD,QAAQ,MAAM,MAAM,eAAe,MAAM,CAAC,CAAC,KACzC,MAAM,KAAK,EAAE,MAAM,MAAM,UAAU;EACjC,MAAM;EACN,OAAO,QAAQ;CACjB,EAAE,GACF,MAAM,KAAK,EAAE,MAAM,YAAY,IAAI,EAAE,kBAAkB;EACrD,MAAM;EACN,OAAO,QAAQ,UAAU,UAAU;CACrC,EAAE,GACF,MAAM,UACR;AACF,CAAC,GACD,OAAO,YAEH,UAIG;CACH,MAAM,UAAU,MAAM,gBAAgB,KAAK;CAC3C,IACE,OAAO,OAAO,OAAO,KACrB,OAAO,GAAGA,uBAAoC,CAAC,CAAC,QAAQ,KAAK,GAE7D,OAAO,OAAO,KAAK,QAAQ,KAAK;CAClC,OAAO,OAAO,KACZ,IAAI,gBAAgB,EAClB,YACE,OAAO,OAAO,OAAO,KACrBC,eAA4B,QAAQ,KAAK,IACrCC,mBAAgC,QAAQ,KAAK,IAC7C,MAAM,OAAO,KAAK,EAC1B,CAAC,CACH;AACF,CACF,CACF;AAEF,MAAM,WAAW,SAAS,QAAQ;CAChC,aAAa,OAAO;CACpB,WAAW,mBACT,SAAS,gBAAgB,yBAAyB;CACpD,WAAW,mBACT,SACE,gBACA,qBAAqB,KAAK,OAAO,KAAK,EAAE,eAAe,QAAQ,CAAC,CAClE;CACF,WAAW,YAAY,SAAS,SAAS,kBAAkB,QAAQ,KAAK,CAAC;CACzE,SAAS,YACP,SACE,SACA,mBAAmB,QAAQ,UAAU,QAAQ,cAAc,QAAQ,KAAK,CAC1E;AACJ,CAAC;AAGD,MAAM,YAAY,QAAQ;AAC1B,QAAQ,KAAK,oBAAoB,QAAQ,KAAK,CAAC,CAAC;AAChD,MAAM,cAAc,OAAO,WAAW;CACpC,IAAI,CAAC,QAAQ,aAAa,QAAQ,SAAS,WAAW,QAAQ,KAAK,CAAC;CACpE,IAAI;EACF,QAAQ,KAAK,WAAW,CAAC;CAC3B,QAAQ;EACN,QAAQ,KAAK,CAAC;CAChB;AACF,CAAC,CAAC,CAAC,KAAK,OAAO,OAAO,EAAE,UAAU,SAAS,OAAO,UAAU,EAAE,CAAC,CAAC;AAEhE,UAAU,MAAM,QAAQ,CAAC,CAAC,KACxB,MAAM,QAAQ,QAAQ,GACtB,MAAM,QAAQ,aAAa,KAAK,GAChC,MAAM,QACJ,UAAU,0BAA0B,KAClC,MAAM,QAAQ,iBAAiB,KAAK,CACtC,CACF,GACA,MAAM,QACN,OAAO,UAAU,WAAW,GAC5B,OAAO,SAAS,OAAO,cAAc,QAAQ,KAAK,CAAC,CAAC,GACpD,YAAY,OACd"}
|
package/dist/FunctionModule.mjs
CHANGED
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { fromGroupModulePath, modulePath } from "./GroupPath.mjs";
|
|
2
|
+
import { ProjectRoot } from "./ProjectRoot.mjs";
|
|
2
3
|
import { logFileAdded, logFileModified, logFileRemoved } from "./log.mjs";
|
|
4
|
+
import { UnownedConvexEntrypointError } from "./CodegenError.mjs";
|
|
3
5
|
import { ConvexDirectory } from "./ConvexDirectory.mjs";
|
|
4
6
|
import { ConfectDirectory } from "./ConfectDirectory.mjs";
|
|
5
7
|
import { CodeBlockWriter } from "./CodeBlockWriter.mjs";
|
|
6
|
-
import {
|
|
8
|
+
import { crons, declaredHttp, http } from "./templates.mjs";
|
|
9
|
+
import { removePathIfExists, toModuleImportPath, toPosixPath } from "./utils.mjs";
|
|
7
10
|
import { GroupPaths } from "./GroupPaths.mjs";
|
|
8
11
|
import { functionPaths, plan } from "./GenerationSnapshot.mjs";
|
|
9
12
|
import * as Effect from "effect/Effect";
|
|
@@ -14,6 +17,88 @@ import { pipe } from "effect/Function";
|
|
|
14
17
|
import * as HashSet from "effect/HashSet";
|
|
15
18
|
import * as Match from "effect/Match";
|
|
16
19
|
//#region src/FunctionModule.ts
|
|
20
|
+
const RESERVED_CONVEX_TS_FILE_NAMES = /* @__PURE__ */ new Set([
|
|
21
|
+
"schema.ts",
|
|
22
|
+
"http.ts",
|
|
23
|
+
"crons.ts",
|
|
24
|
+
"auth.config.ts",
|
|
25
|
+
"convex.config.ts"
|
|
26
|
+
]);
|
|
27
|
+
const getEntrypoints = Effect.gen(function* () {
|
|
28
|
+
const fs = yield* FileSystem.FileSystem;
|
|
29
|
+
const path = yield* Path.Path;
|
|
30
|
+
const convex = yield* ConvexDirectory.get;
|
|
31
|
+
const files = yield* fs.readDirectory(convex, { recursive: true });
|
|
32
|
+
const components = files.filter((file) => path.basename(file) === "convex.config.ts" && path.dirname(file) !== ".").map((file) => path.dirname(file) + path.sep);
|
|
33
|
+
return files.filter((file) => {
|
|
34
|
+
const base = path.basename(file);
|
|
35
|
+
return !file.startsWith("_generated" + path.sep) && !components.some((component) => file.startsWith(component)) && /\.(?:js|mjs|cjs|ts|tsx|mts|cts|jsx)$/.test(base) && !base.startsWith(".") && !base.startsWith("#") && (base.match(/\./g)?.length ?? 0) === 1 && base !== "schema.ts" && base !== "schema.js" && !file.includes(" ");
|
|
36
|
+
});
|
|
37
|
+
});
|
|
38
|
+
const tokenize = (source, modulePath, path) => {
|
|
39
|
+
const token = /\s+|\/\/[^\r\n]*|\/\*[\s\S]*?\*\/|"(?:\\.|[^"\\\r\n])*"|'(?:\\.|[^'\\\r\n])*'|[$A-Z_a-z][$\w]*|[{}()[\].,:;=]/y;
|
|
40
|
+
const tokens = [];
|
|
41
|
+
while (token.lastIndex < source.length) {
|
|
42
|
+
const match = token.exec(source);
|
|
43
|
+
if (match === null) return void 0;
|
|
44
|
+
const value = match[0];
|
|
45
|
+
if (/^\s|^\//.test(value)) continue;
|
|
46
|
+
if (value.startsWith("\"") || value.startsWith("'")) {
|
|
47
|
+
const literal = value.slice(1, -1);
|
|
48
|
+
tokens.push(JSON.stringify(literal.startsWith(".") ? path.resolve(path.dirname(modulePath), literal.replace(/\.js$/, "")) : literal));
|
|
49
|
+
} else tokens.push(value);
|
|
50
|
+
}
|
|
51
|
+
return tokens;
|
|
52
|
+
};
|
|
53
|
+
const matchesShape = (actual, expected) => {
|
|
54
|
+
let index = 0;
|
|
55
|
+
for (const token of expected) {
|
|
56
|
+
if (token === ";" && actual[index] !== ";") continue;
|
|
57
|
+
if (actual[index] === "," && (token === "}" || token === ")")) index++;
|
|
58
|
+
if (actual[index++] !== token) return false;
|
|
59
|
+
}
|
|
60
|
+
return index === actual.length;
|
|
61
|
+
};
|
|
62
|
+
const assertOwnedEntrypoints = Effect.gen(function* () {
|
|
63
|
+
const fs = yield* FileSystem.FileSystem;
|
|
64
|
+
const path = yield* Path.Path;
|
|
65
|
+
const convex = yield* ConvexDirectory.get;
|
|
66
|
+
const confect = yield* ConfectDirectory.get;
|
|
67
|
+
const projectRoot = yield* ProjectRoot.get;
|
|
68
|
+
const importFromConvex = (file) => toModuleImportPath(path.relative(convex, path.join(confect, file)));
|
|
69
|
+
const optional = /* @__PURE__ */ new Map([["http.ts", [
|
|
70
|
+
yield* http({ httpImportPath: yield* importFromConvex("http.ts") }),
|
|
71
|
+
yield* declaredHttp({
|
|
72
|
+
schemaImportPath: yield* importFromConvex("_generated/schema.ts"),
|
|
73
|
+
httpImportPath: yield* importFromConvex("http.ts")
|
|
74
|
+
}),
|
|
75
|
+
yield* declaredHttp({
|
|
76
|
+
schemaImportPath: yield* importFromConvex("_generated/schema.ts"),
|
|
77
|
+
httpImportPath: yield* importFromConvex("http.ts"),
|
|
78
|
+
runtimeImportPath: yield* importFromConvex("runtime.ts")
|
|
79
|
+
})
|
|
80
|
+
]], ["crons.ts", [yield* crons({ cronsImportPath: yield* importFromConvex("crons.ts") })]]]);
|
|
81
|
+
const refused = [];
|
|
82
|
+
for (const relative of yield* getEntrypoints) {
|
|
83
|
+
const absolute = path.join(convex, relative);
|
|
84
|
+
const tokens = tokenize(yield* fs.readFileString(absolute), absolute, path);
|
|
85
|
+
if (tokens !== void 0) {
|
|
86
|
+
if (optional.get(relative)?.some((template) => matchesShape(tokens, tokenize(template, absolute, path)))) continue;
|
|
87
|
+
if (path.extname(relative) === ".ts") {
|
|
88
|
+
const names = tokens.flatMap((token, index) => token === "export" && tokens[index + 1] === "const" ? [tokens[index + 2]] : []);
|
|
89
|
+
const group = yield* fromGroupModulePath(relative);
|
|
90
|
+
const template = yield* render({
|
|
91
|
+
functionNames: names,
|
|
92
|
+
registeredFunctionsImportPath: yield* registeredFunctionsImportPathForGroup(group, absolute),
|
|
93
|
+
useNode: tokens[0] === "\"use node\""
|
|
94
|
+
});
|
|
95
|
+
if (names.length > 0 && new Set(names).size === names.length && matchesShape(tokens, tokenize(template, absolute, path))) continue;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
refused.push(toPosixPath(path, path.relative(projectRoot, absolute)));
|
|
99
|
+
}
|
|
100
|
+
if (refused.length > 0) return yield* new UnownedConvexEntrypointError({ filePaths: refused.sort() });
|
|
101
|
+
});
|
|
17
102
|
const render = ({ functionNames, registeredFunctionsImportPath, useNode = false }) => renderEffect({
|
|
18
103
|
functionNames,
|
|
19
104
|
registeredFunctionsImportPath,
|
|
@@ -41,20 +126,20 @@ const generateGroupModuleEffect = Effect.fnUntraced(function* ({ groupPath, func
|
|
|
41
126
|
const path = yield* Path.Path;
|
|
42
127
|
const convexDirectory = yield* ConvexDirectory.get;
|
|
43
128
|
const relativeModulePath = yield* modulePath(groupPath);
|
|
44
|
-
const modulePath$
|
|
45
|
-
const directoryPath = path.dirname(modulePath$
|
|
129
|
+
const modulePath$2 = path.join(convexDirectory, relativeModulePath);
|
|
130
|
+
const directoryPath = path.dirname(modulePath$2);
|
|
46
131
|
if (!(yield* fs.exists(directoryPath))) yield* fs.makeDirectory(directoryPath, { recursive: true });
|
|
47
132
|
const functionsContentsString = yield* render({
|
|
48
133
|
functionNames,
|
|
49
134
|
registeredFunctionsImportPath,
|
|
50
135
|
useNode
|
|
51
136
|
});
|
|
52
|
-
if (!(yield* fs.exists(modulePath$
|
|
53
|
-
yield* fs.writeFileString(modulePath$
|
|
137
|
+
if (!(yield* fs.exists(modulePath$2))) {
|
|
138
|
+
yield* fs.writeFileString(modulePath$2, functionsContentsString);
|
|
54
139
|
return "Added";
|
|
55
140
|
}
|
|
56
|
-
if ((yield* fs.readFileString(modulePath$
|
|
57
|
-
yield* fs.writeFileString(modulePath$
|
|
141
|
+
if ((yield* fs.readFileString(modulePath$2)) !== functionsContentsString) {
|
|
142
|
+
yield* fs.writeFileString(modulePath$2, functionsContentsString);
|
|
58
143
|
return "Modified";
|
|
59
144
|
}
|
|
60
145
|
return "Unchanged";
|
|
@@ -92,18 +177,9 @@ const applyFunctionPlan = Effect.fnUntraced(function* (plan) {
|
|
|
92
177
|
yield* writeGroups(plan.changed);
|
|
93
178
|
});
|
|
94
179
|
const getGroupPathsFromFs = Effect.gen(function* () {
|
|
95
|
-
const fs = yield* FileSystem.FileSystem;
|
|
96
180
|
const path = yield* Path.Path;
|
|
97
|
-
const
|
|
98
|
-
const
|
|
99
|
-
"schema.ts",
|
|
100
|
-
"http.ts",
|
|
101
|
-
"crons.ts",
|
|
102
|
-
"auth.config.ts",
|
|
103
|
-
"convex.config.ts"
|
|
104
|
-
]);
|
|
105
|
-
const allConvexPaths = yield* fs.readDirectory(convexDirectory, { recursive: true });
|
|
106
|
-
const groupPathArray = yield* pipe(allConvexPaths, Array.filter((convexPath) => path.extname(convexPath) === ".ts" && !RESERVED_CONVEX_TS_FILE_NAMES.has(path.basename(convexPath)) && path.basename(path.dirname(convexPath)) !== "_generated"), Effect.forEach((groupModulePath) => fromGroupModulePath(groupModulePath)));
|
|
181
|
+
const allConvexPaths = yield* getEntrypoints;
|
|
182
|
+
const groupPathArray = yield* pipe(allConvexPaths, Array.filter((convexPath) => path.extname(convexPath) === ".ts" && !RESERVED_CONVEX_TS_FILE_NAMES.has(path.basename(convexPath))), Effect.forEach((groupModulePath) => fromGroupModulePath(groupModulePath)));
|
|
107
183
|
return GroupPaths.make(HashSet.fromIterable(groupPathArray));
|
|
108
184
|
});
|
|
109
185
|
const removeGroups = Effect.fnUntraced(function* (groupPaths) {
|
|
@@ -111,9 +187,9 @@ const removeGroups = Effect.fnUntraced(function* (groupPaths) {
|
|
|
111
187
|
const convexDirectory = yield* ConvexDirectory.get;
|
|
112
188
|
yield* Effect.all(HashSet.map(groupPaths, (groupPath) => Effect.gen(function* () {
|
|
113
189
|
const relativeModulePath = yield* modulePath(groupPath);
|
|
114
|
-
const modulePath$
|
|
190
|
+
const modulePath$1 = path.join(convexDirectory, relativeModulePath);
|
|
115
191
|
yield* Effect.logDebug(`Removing group '${relativeModulePath}'...`);
|
|
116
|
-
yield* removePathIfExists(modulePath$
|
|
192
|
+
yield* removePathIfExists(modulePath$1);
|
|
117
193
|
yield* Effect.logDebug(`Group '${relativeModulePath}' removed`);
|
|
118
194
|
})), { concurrency: "unbounded" });
|
|
119
195
|
});
|
|
@@ -121,17 +197,17 @@ const writeGroups = (groups) => Effect.forEach(groups, Effect.fnUntraced(functio
|
|
|
121
197
|
const path = yield* Path.Path;
|
|
122
198
|
const convexDirectory = yield* ConvexDirectory.get;
|
|
123
199
|
const relativeModulePath = yield* modulePath(group.path);
|
|
124
|
-
const modulePath$
|
|
125
|
-
const registeredFunctionsImportPath = yield* registeredFunctionsImportPathForGroup(group.path, modulePath$
|
|
200
|
+
const modulePath$3 = path.join(convexDirectory, relativeModulePath);
|
|
201
|
+
const registeredFunctionsImportPath = yield* registeredFunctionsImportPathForGroup(group.path, modulePath$3);
|
|
126
202
|
const change = yield* generateGroupModule({
|
|
127
203
|
groupPath: group.path,
|
|
128
204
|
functionNames: group.functionNames,
|
|
129
205
|
registeredFunctionsImportPath,
|
|
130
206
|
useNode: group.runtime === "Node"
|
|
131
207
|
});
|
|
132
|
-
yield* Match.value(change).pipe(Match.when("Added", () => logFileAdded(modulePath$
|
|
208
|
+
yield* Match.value(change).pipe(Match.when("Added", () => logFileAdded(modulePath$3)), Match.when("Modified", () => logFileModified(modulePath$3)), Match.when("Unchanged", () => Effect.void), Match.exhaustive);
|
|
133
209
|
}));
|
|
134
210
|
//#endregion
|
|
135
|
-
export { applyFunctionPlan, generateFunctions, generateGroupModule, registeredFunctionsImportPathForGroup, removeGroups, render, writeGroups };
|
|
211
|
+
export { applyFunctionPlan, assertOwnedEntrypoints, generateFunctions, generateGroupModule, registeredFunctionsImportPathForGroup, removeGroups, render, writeGroups };
|
|
136
212
|
|
|
137
213
|
//# sourceMappingURL=FunctionModule.mjs.map
|