@gaganref/confect-cli 10.3.1-fork.85 → 10.3.1-fork.86
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/LeafModule.mjs +25 -2
- package/dist/LeafModule.mjs.map +1 -1
- package/dist/ManifestSections.mjs +62 -38
- package/dist/ManifestSections.mjs.map +1 -1
- package/dist/SectionFiles.mjs +111 -45
- package/dist/SectionFiles.mjs.map +1 -1
- package/dist/Watcher.mjs +4 -3
- package/dist/Watcher.mjs.map +1 -1
- package/dist/confect/codegen.mjs +17 -7
- package/dist/confect/codegen.mjs.map +1 -1
- package/dist/confect/declaration.mjs +10 -5
- package/dist/confect/declaration.mjs.map +1 -1
- package/package.json +3 -3
package/dist/LeafModule.mjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { fromBundlerError } from "./BuildError.mjs";
|
|
1
|
+
import { BundleFailedError, fromBundlerError } from "./BuildError.mjs";
|
|
2
2
|
import { bundle, directlyImports, importersOfPackage, withBatch } from "./Bundler.mjs";
|
|
3
3
|
import { ImplMissingDefaultLayerError, ImplMissingFunctionsError, ImplMissingMiddlewareError, ImplMissingSpecImportError, ImplNotFinalizedError, InvalidDeclarationError, InvalidMiddlewareAttachmentError, MissingImplFileError, MissingSpecFileError, RequiredMiddlewareError, SpecImportsServerError, SpecMissingDefaultGroupSpecError } from "./CodegenError.mjs";
|
|
4
4
|
import { ConfectDirectory } from "./ConfectDirectory.mjs";
|
|
@@ -184,11 +184,34 @@ const buildImplLayer = Effect.fnUntraced(function* (implLayer) {
|
|
|
184
184
|
* function declared by the spec. Return uncovered middleware requirements for
|
|
185
185
|
* the caller to report across groups.
|
|
186
186
|
*/
|
|
187
|
+
/**
|
|
188
|
+
* An implementation's unresolved import of a `confect/_generated` file is a
|
|
189
|
+
* section file that no declared section writes: every declared section's file
|
|
190
|
+
* is on disk before implementations validate. Say so, at the import.
|
|
191
|
+
*/
|
|
192
|
+
const nameUnwrittenSectionFiles = Effect.fnUntraced(function* (error, bundleDirectory) {
|
|
193
|
+
const path = yield* Path.Path;
|
|
194
|
+
const generated = path.join(yield* ConfectDirectory.get, "_generated");
|
|
195
|
+
const errors = error.errors.map((message) => {
|
|
196
|
+
const specifier = /^Could not resolve "(.+)"$/.exec(message.text)?.[1];
|
|
197
|
+
if (specifier === void 0 || message.location === null) return message;
|
|
198
|
+
const file = path.relative(generated, path.resolve(bundleDirectory, path.dirname(message.location.file), specifier));
|
|
199
|
+
if (file.startsWith("..") || path.isAbsolute(file)) return message;
|
|
200
|
+
const extension = path.extname(file);
|
|
201
|
+
const name = toPosixPath(path, extension === "" ? `${file}.ts` : extension === ".js" ? `${file.slice(0, -extension.length)}.ts` : file);
|
|
202
|
+
return Object.assign({}, message, { text: `No manifest section this backend declares writes _generated/${name}. Declare its section on App.make({ manifestSections }) in confect/app.ts.` });
|
|
203
|
+
});
|
|
204
|
+
return new BundleFailedError({
|
|
205
|
+
file: error.file,
|
|
206
|
+
errors
|
|
207
|
+
});
|
|
208
|
+
});
|
|
187
209
|
const validateImpl = Effect.fn("LeafModule.validateImpl")(function* (leaf, required = []) {
|
|
210
|
+
const path = yield* Path.Path;
|
|
188
211
|
const implRelativePath = yield* implPathForSpec(leaf.relativePath);
|
|
189
212
|
const implAbsolutePath = yield* absoluteModulePath(implRelativePath);
|
|
190
213
|
const specAbsolutePath = yield* absoluteModulePath(leaf.relativePath);
|
|
191
|
-
const bundled = yield* bundle(implAbsolutePath).pipe(Effect.mapError((error) => fromBundlerError(implRelativePath, error)));
|
|
214
|
+
const bundled = yield* bundle(implAbsolutePath).pipe(Effect.mapError((error) => fromBundlerError(implRelativePath, error)), Effect.catchTag("BundleFailedError", (error) => Effect.flip(nameUnwrittenSectionFiles(error, path.dirname(implAbsolutePath)))));
|
|
192
215
|
if (!(yield* directlyImports(bundled, implAbsolutePath, specAbsolutePath))) return yield* new ImplMissingSpecImportError({
|
|
193
216
|
implPath: implRelativePath,
|
|
194
217
|
expectedSpecPath: leaf.relativePath
|
package/dist/LeafModule.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LeafModule.mjs","names":["Bundler.importersOfPackage","Bundler.bundle","Bundler.directlyImports","Bundler.withBatch"],"sources":["../src/LeafModule.ts"],"sourcesContent":["import { GroupSpec, MiddlewareAttachment } from \"@confect/core\";\nimport { Registry, RegistryItems } from \"@confect/server\";\nimport * as GroupImpl from \"@confect/server/GroupImpl\";\nimport * as FileSystem from \"effect/FileSystem\";\nimport * as Path from \"effect/Path\";\nimport type { Context } from \"effect\";\nimport * as Array from \"effect/Array\";\nimport * as Brand from \"effect/Brand\";\nimport * as Effect from \"effect/Effect\";\nimport * as HashSet from \"effect/HashSet\";\nimport * as Layer from \"effect/Layer\";\nimport * as Option from \"effect/Option\";\nimport * as Ref from \"effect/Ref\";\nimport * as Schema from \"effect/Schema\";\nimport * as String from \"effect/String\";\nimport { fromBundlerError } from \"./BuildError.js\";\nimport * as Bundler from \"./Bundler.js\";\nimport {\n InvalidDeclarationError,\n MissingImplFileError,\n MissingSpecFileError,\n ImplMissingDefaultLayerError,\n ImplMissingFunctionsError,\n ImplMissingMiddlewareError,\n RequiredMiddlewareError,\n ImplMissingSpecImportError,\n ImplNotFinalizedError,\n InvalidMiddlewareAttachmentError,\n SpecImportsServerError,\n SpecMissingDefaultGroupSpecError,\n} from \"./CodegenError.js\";\nimport { ConfectDirectory } from \"./ConfectDirectory.js\";\nimport { ImplModulePath } from \"./ImplModulePath.js\";\nimport { removePathExtension, toPosixPath } from \"./utils.js\";\n\nexport interface LeafModule {\n readonly relativePath: string;\n readonly pathSegments: readonly [string, ...string[]];\n readonly groupPathDot: string;\n readonly exportName: string;\n readonly specImportPath: string;\n}\n\nexport type LoadedLeafModule = LeafModule & {\n readonly spec: GroupSpec.AnyWithProps;\n} & Brand.Brand<\"@confect/cli/LoadedLeafModule\">;\n\nconst LoadedLeafModule = Brand.nominal<LoadedLeafModule>();\n\nconst VALIDATION_CONCURRENCY = 4;\n\nexport const SPEC_SUFFIX = \".spec.ts\";\nexport const IMPL_SUFFIX = \".impl.ts\";\n\nconst swapModuleSuffix = Effect.fnUntraced(function* (\n relativePath: string,\n fromSuffix: string,\n toSuffix: string,\n) {\n const path = yield* Path.Path;\n const { dir, name, ext } = path.parse(relativePath);\n if (ext !== \".ts\" || !name.endsWith(fromSuffix.slice(0, -\".ts\".length))) {\n return relativePath;\n }\n\n const stem = name.slice(0, -fromSuffix.slice(0, -\".ts\".length).length);\n const nextName = `${stem}${toSuffix.slice(0, -\".ts\".length)}`;\n return dir.length > 0\n ? path.join(dir, `${nextName}${ext}`)\n : `${nextName}${ext}`;\n});\n\nexport const isLeafSpecPath = (relativePath: string) =>\n relativePath.endsWith(SPEC_SUFFIX);\n\nexport const exportNameFromModulePath = Effect.fnUntraced(function* (\n relativePath: string,\n) {\n const path = yield* Path.Path;\n const { name, ext } = path.parse(relativePath);\n if (ext !== \".ts\") {\n return name;\n }\n return name.endsWith(\".spec\") ? name.slice(0, -\".spec\".length) : name;\n});\n\nexport const groupPathFromRelativeModulePath = Effect.fnUntraced(function* (\n relativePath: string,\n) {\n const path = yield* Path.Path;\n const { dir, name, ext } = path.parse(relativePath);\n const stem =\n ext === \".ts\" && name.endsWith(\".spec\")\n ? name.slice(0, -\".spec\".length)\n : name;\n const dirSegments = Array.filter(\n String.split(dir, path.sep),\n String.isNonEmpty,\n );\n const pathSegments = Array.append(dirSegments, stem) as [string, ...string[]];\n return {\n pathSegments,\n groupPathDot: Array.join(pathSegments, \".\"),\n };\n});\n\nexport const specImportPathFromGenerated = Effect.fnUntraced(function* (\n specRelativePath: string,\n) {\n const path = yield* Path.Path;\n const withoutExt = toPosixPath(\n path,\n yield* removePathExtension(specRelativePath),\n );\n return `../${withoutExt}.js`;\n});\n\nexport const specPathForImpl = (implRelativePath: string) =>\n swapModuleSuffix(implRelativePath, IMPL_SUFFIX, SPEC_SUFFIX);\n\nexport const implPathForSpec = (specRelativePath: string) =>\n swapModuleSuffix(specRelativePath, SPEC_SUFFIX, IMPL_SUFFIX);\n\nexport const registeredFunctionsRelativePath = Effect.fnUntraced(function* (\n leaf: LeafModule,\n) {\n const path = yield* Path.Path;\n return path.join(\"registeredFunctions\", ...leaf.pathSegments) + \".ts\";\n});\n\nexport const discoverLeafSpecFiles = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n\n const excludedDirs = HashSet.make(\"_generated\", \"tables\", \"middleware\");\n const excludedFiles = HashSet.make(\"nodeSpec.ts\", \"spec.ts\");\n\n const allPaths = yield* fs.readDirectory(confectDirectory, {\n recursive: true,\n });\n\n return Array.filter(allPaths, (relativePath) => {\n if (!isLeafSpecPath(relativePath)) {\n return false;\n }\n\n if (HashSet.has(excludedFiles, relativePath)) {\n return false;\n }\n\n const segments = String.split(relativePath, path.sep);\n return !Array.some(segments, (segment) =>\n HashSet.has(excludedDirs, segment),\n );\n });\n});\n\nexport const discoverLeafImplFiles = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n\n const excludedDirs = HashSet.make(\"_generated\", \"tables\", \"middleware\");\n\n const allPaths = yield* fs.readDirectory(confectDirectory, {\n recursive: true,\n });\n\n return Array.filter(\n Array.filterMap(allPaths, (relativePath) =>\n Schema.decodeResult(ImplModulePath)(relativePath),\n ),\n (relativePath) => {\n const segments = String.split(relativePath, path.sep);\n return !Array.some(segments, (segment) =>\n HashSet.has(excludedDirs, segment),\n );\n },\n );\n});\n\nexport const toLeafModule = Effect.fnUntraced(function* (\n specRelativePath: string,\n) {\n const exportName = yield* exportNameFromModulePath(specRelativePath);\n const { pathSegments, groupPathDot } =\n yield* groupPathFromRelativeModulePath(specRelativePath);\n const specImportPath = yield* specImportPathFromGenerated(specRelativePath);\n\n return {\n relativePath: specRelativePath,\n pathSegments,\n groupPathDot,\n exportName,\n specImportPath,\n } satisfies LeafModule;\n});\n\nconst absoluteModulePath = Effect.fnUntraced(function* (relativePath: string) {\n const confectDirectory = yield* ConfectDirectory.get;\n const path = yield* Path.Path;\n return path.resolve(confectDirectory, relativePath);\n});\n\n/**\n * Every `*.spec.ts` is reachable from `_generated/spec.ts`, which the client\n * imports through `_generated/refs.ts`—so a spec's whole import graph is\n * bundled into the browser whether or not the client calls those functions.\n * Server logic co-located with a declaration therefore ships to users,\n * silently.\n *\n * `@confect/server` is a sound proxy for \"server logic lives here\": an\n * implementation can't be written without `FunctionImpl`/`MiddlewareImpl`, both\n * of which live there. Table `Doc`/`Fields` schemas live in `@confect/core`, so\n * the documented `notes.Doc` pattern in a spec must not reach `@confect/server`\n * even through `tables/` or `_generated/`. The check runs over the spec\n * bundle's transitive inputs rather than the spec module alone, so it also\n * covers middleware declarations under `confect/middleware/` (which codegen\n * otherwise never visits) and any shared helper a spec pulls in—while only ever\n * flagging modules that genuinely reach the client.\n */\nconst validateClientSafety = Effect.fnUntraced(function* (\n leaf: LeafModule,\n bundled: Bundler.Bundled,\n) {\n const path = yield* Path.Path;\n const confectDirectory = path.resolve(yield* ConfectDirectory.get);\n\n const isCheckedUserModule = (absolutePath: string) => {\n const relative = path.relative(confectDirectory, absolutePath);\n return !relative.startsWith(\"..\") && !path.isAbsolute(relative);\n };\n\n const importers = Bundler.importersOfPackage(\n bundled,\n \"@confect/server\",\n isCheckedUserModule,\n );\n\n if (importers.length > 0) {\n return yield* new SpecImportsServerError({\n specPath: leaf.relativePath,\n importerPaths: Array.map(importers, (absolutePath) =>\n toPosixPath(path, path.relative(confectDirectory, absolutePath)),\n ),\n });\n }\n});\n\nconst validateReservedArguments = Effect.fnUntraced(function* (\n group: GroupSpec.AnyWithProps,\n specPath: string,\n groupPath: string,\n): Effect.fn.Return<void, InvalidDeclarationError> {\n for (const spec of Object.values(group.functions)) {\n const name = spec.reservedArgument;\n const provenance = spec.functionProvenance;\n if (\n name !== undefined &&\n provenance._tag === \"Confect\" &&\n Object.hasOwn(provenance.args.fields, name)\n ) {\n return yield* new InvalidDeclarationError({\n declarationPath: `confect/${specPath}`,\n reason: `${groupPath}:${spec.name} declares the argument \"${name}\", which its profile reserves. Rename the argument.`,\n });\n }\n }\n for (const [name, child] of Object.entries(group.groups)) {\n yield* validateReservedArguments(child, specPath, `${groupPath}/${name}`);\n }\n});\n\n/**\n * Validate that the leaf's spec file default-exports a `GroupSpec`, and that\n * nothing it reaches drags server code into the client (see\n * {@link validateClientSafety}). Returns the leaf paired with its validated\n * spec, so subsequent operations reuse that association without re-bundling.\n * The runtime is declared by the spec, not its file location.\n */\nexport const loadSpec = Effect.fn(\"LeafModule.loadSpec\")(function* (\n leaf: LeafModule,\n) {\n const absolutePath = yield* absoluteModulePath(leaf.relativePath);\n const bundled = yield* Bundler.bundle(absolutePath).pipe(\n Effect.mapError((error) => fromBundlerError(leaf.relativePath, error)),\n );\n\n const groupSpec = bundled.module.default;\n\n if (!GroupSpec.isGroupSpec(groupSpec)) {\n return yield* new SpecMissingDefaultGroupSpecError({\n specPath: leaf.relativePath,\n });\n }\n\n yield* validateClientSafety(leaf, bundled);\n yield* validateReservedArguments(\n groupSpec,\n leaf.relativePath,\n leaf.pathSegments.join(\"/\"),\n );\n\n yield* Effect.fromResult(GroupSpec.validateMiddleware(groupSpec)).pipe(\n Effect.mapError(\n (error) =>\n new InvalidMiddlewareAttachmentError({\n specPath: leaf.relativePath,\n message: MiddlewareAttachment.formatValidationError(error),\n }),\n ),\n );\n\n return LoadedLeafModule({\n ...leaf,\n spec: groupSpec,\n });\n});\n\n/**\n * Walk the built `Context` for a `Finalized` `GroupImpl` service value. The\n * lookup is value-shaped (via `GroupImpl.isFinalizedGroupImpl`) so we don't\n * need to know the group's path up front to construct a typed tag for it.\n */\nconst findFinalizedGroupImpl = <S>(\n context: Context.Context<S>,\n): Option.Option<GroupImpl.AnyFinalized> =>\n Array.findFirst(context.mapUnsafe.values(), GroupImpl.isFinalizedGroupImpl);\n\n/**\n * Build the impl layer with a fresh `Registry` so each validation is isolated\n * from prior validations' `FunctionImpl.make` writes. Retain its items to check\n * required middleware against actual function attachments.\n */\nconst buildImplLayer = Effect.fnUntraced(function* (\n implLayer: Layer.Layer<unknown>,\n) {\n const registry = Ref.makeUnsafe<RegistryItems.RegistryItems>({});\n const context = yield* Layer.build(\n implLayer as Layer.Layer<unknown, never, never>,\n ).pipe(Effect.provideService(Registry.Registry, registry));\n return { context, items: yield* Ref.get(registry) };\n}, Effect.scoped);\n\n/**\n * Validate that the leaf's sibling impl file imports the spec, default-exports\n * a finalized `GroupImpl` layer, and provides a `FunctionImpl` for every\n * function declared by the spec. Return uncovered middleware requirements for\n * the caller to report across groups.\n */\nexport const validateImpl = Effect.fn(\"LeafModule.validateImpl\")(function* (\n leaf: LoadedLeafModule,\n required: ReadonlyArray<{ readonly key: string }> = [],\n) {\n const implRelativePath = yield* implPathForSpec(leaf.relativePath);\n const implAbsolutePath = yield* absoluteModulePath(implRelativePath);\n const specAbsolutePath = yield* absoluteModulePath(leaf.relativePath);\n\n const bundled = yield* Bundler.bundle(implAbsolutePath).pipe(\n Effect.mapError((error) => fromBundlerError(implRelativePath, error)),\n );\n\n if (\n !(yield* Bundler.directlyImports(\n bundled,\n implAbsolutePath,\n specAbsolutePath,\n ))\n ) {\n return yield* new ImplMissingSpecImportError({\n implPath: implRelativePath,\n expectedSpecPath: leaf.relativePath,\n });\n }\n\n if (!Layer.isLayer(bundled.module.default)) {\n return yield* new ImplMissingDefaultLayerError({\n implPath: implRelativePath,\n });\n }\n\n const groupSpec = leaf.spec;\n const expectedFunctionNames = Object.keys(groupSpec.functions);\n\n const { context, items } = yield* buildImplLayer(\n bundled.module.default as Layer.Layer<unknown>,\n );\n const finalizedGroupImpl = yield* Option.match(\n findFinalizedGroupImpl(context),\n {\n onNone: () => new ImplNotFinalizedError({ implPath: implRelativePath }),\n onSome: Effect.succeed,\n },\n );\n\n const registeredSet = HashSet.fromIterable(\n finalizedGroupImpl.registeredFunctionNames,\n );\n const missing = expectedFunctionNames.filter(\n (name) => !HashSet.has(registeredSet, name),\n );\n\n if (missing.length > 0) {\n return yield* new ImplMissingFunctionsError({\n implPath: implRelativePath,\n groupPath: leaf.groupPathDot,\n missingFunctionNames: missing,\n });\n }\n\n const expectedMiddlewareKeys = Array.dedupe([\n ...(groupSpec.middlewareSpecs ?? []).map(\n (middlewareSpec) => middlewareSpec.key,\n ),\n ...Object.values(groupSpec.functions).flatMap((function_) =>\n (function_.middlewareSpecs ?? []).map(\n (middlewareSpec) => middlewareSpec.key,\n ),\n ),\n ]);\n const registeredMiddlewareKeys = HashSet.fromIterable(\n finalizedGroupImpl.registeredMiddlewareKeys ?? [],\n );\n const missingMiddleware = Array.filter(\n expectedMiddlewareKeys,\n (key) => !HashSet.has(registeredMiddlewareKeys, key),\n );\n\n if (missingMiddleware.length > 0) {\n return yield* new ImplMissingMiddlewareError({\n implPath: implRelativePath,\n groupPath: leaf.groupPathDot,\n missingMiddlewareKeys: missingMiddleware,\n });\n }\n\n return RegistryItems.missingRequired(items, required, leaf.groupPathDot);\n});\n\nexport const withImplFiles = Effect.fnUntraced(function* <A, E, R>(\n relativePaths: ReadonlyArray<ImplModulePath>,\n use: (leaves: ReadonlyArray<LoadedLeafModule>) => Effect.Effect<A, E, R>,\n) {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n const pairs = yield* Effect.forEach(relativePaths, (implRelativePath) =>\n specPathForImpl(implRelativePath).pipe(\n Effect.map((specRelativePath) => ({\n implRelativePath,\n specRelativePath,\n })),\n ),\n );\n\n return yield* Bundler.withBatch(\n pairs.flatMap(({ implRelativePath, specRelativePath }) => [\n path.resolve(confectDirectory, implRelativePath),\n path.resolve(confectDirectory, specRelativePath),\n ]),\n Effect.gen(function* () {\n const leaves = yield* Effect.forEach(\n pairs,\n Effect.fnUntraced(function* ({ implRelativePath, specRelativePath }) {\n if (\n !(yield* fs.exists(path.join(confectDirectory, specRelativePath)))\n ) {\n return yield* new MissingSpecFileError({\n implPath: implRelativePath,\n expectedSpecPath: specRelativePath,\n });\n }\n if (\n !(yield* fs.exists(path.join(confectDirectory, implRelativePath)))\n ) {\n return yield* new MissingImplFileError({\n specPath: specRelativePath,\n expectedImplPath: implRelativePath,\n });\n }\n const leaf = yield* loadSpec(yield* toLeafModule(specRelativePath));\n return leaf;\n }),\n { concurrency: VALIDATION_CONCURRENCY },\n );\n return yield* use(leaves);\n }),\n );\n});\n\nexport const validateImplFiles = Effect.fn(\"LeafModule.validateImplFiles\")(\n (relativePaths: ReadonlyArray<ImplModulePath>) =>\n withImplFiles(relativePaths, validateAllImpls),\n);\n\nexport const validateAllImpls = Effect.fnUntraced(function* (\n leaves: ReadonlyArray<LoadedLeafModule>,\n required: ReadonlyArray<{ readonly key: string }> = [],\n) {\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n const implementationPaths = yield* Effect.forEach(\n leaves,\n ({ relativePath }) =>\n implPathForSpec(relativePath).pipe(\n Effect.map((implPath) => path.resolve(confectDirectory, implPath)),\n ),\n );\n const missing = (yield* Bundler.withBatch(\n implementationPaths,\n Effect.forEach(leaves, (leaf) => validateImpl(leaf, required), {\n concurrency: VALIDATION_CONCURRENCY,\n }),\n ))\n .flat()\n .sort((left, right) => left.functionName.localeCompare(right.functionName));\n if (missing.length > 0) {\n return yield* new RequiredMiddlewareError({ missing });\n }\n});\n\nexport const loadAll = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n const specFiles = yield* discoverLeafSpecFiles;\n\n const results = yield* Bundler.withBatch(\n specFiles.map((relativePath) =>\n path.resolve(confectDirectory, relativePath),\n ),\n Effect.forEach(\n specFiles,\n Effect.fnUntraced(function* (specRelativePath: string) {\n const discovered = yield* toLeafModule(specRelativePath);\n const leaf = yield* loadSpec(discovered);\n\n const implRelativePath = yield* implPathForSpec(specRelativePath);\n const implAbsolutePath = path.join(confectDirectory, implRelativePath);\n if (!(yield* fs.exists(implAbsolutePath))) {\n return yield* new MissingImplFileError({\n specPath: specRelativePath,\n expectedImplPath: implRelativePath,\n });\n }\n\n return leaf;\n }),\n { concurrency: VALIDATION_CONCURRENCY },\n ),\n );\n\n yield* validateOrphanImpls(specFiles);\n\n return results;\n});\n\n/**\n * Walk leaf ancestors and fail with a {@link ParentChildNameCollisionError} when\n * a parent leaf declares a function or subgroup whose name matches a sibling\n * subdirectory spec's segment. Without this check the colliding descendant\n * would overwrite the parent's entry in the assembled `GroupSpec.groups` map at\n * runtime, surfacing as a confusing `Refs.make` error rather than a\n * codegen-time diagnostic.\n */\nconst validateOrphanImpls = Effect.fnUntraced(function* (\n specFiles: ReadonlyArray<string>,\n) {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n const implFiles = yield* discoverLeafImplFiles;\n const specPaths = HashSet.fromIterable(specFiles);\n\n yield* Effect.forEach(\n implFiles,\n Effect.fnUntraced(function* (implRelativePath: string) {\n const specRelativePath = yield* specPathForImpl(implRelativePath);\n if (HashSet.has(specPaths, specRelativePath)) {\n return;\n }\n\n const specAbsolutePath = path.join(confectDirectory, specRelativePath);\n if (!(yield* fs.exists(specAbsolutePath))) {\n return yield* new MissingSpecFileError({\n implPath: implRelativePath,\n expectedSpecPath: specRelativePath,\n });\n }\n }),\n );\n});\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"LeafModule.mjs","names":["Bundler.importersOfPackage","Bundler.bundle","Bundler.directlyImports","Bundler.withBatch"],"sources":["../src/LeafModule.ts"],"sourcesContent":["import { GroupSpec, MiddlewareAttachment } from \"@confect/core\";\nimport { Registry, RegistryItems } from \"@confect/server\";\nimport * as GroupImpl from \"@confect/server/GroupImpl\";\nimport * as FileSystem from \"effect/FileSystem\";\nimport * as Path from \"effect/Path\";\nimport type { Context } from \"effect\";\nimport type * as esbuild from \"esbuild\";\nimport * as Array from \"effect/Array\";\nimport * as Brand from \"effect/Brand\";\nimport * as Effect from \"effect/Effect\";\nimport * as HashSet from \"effect/HashSet\";\nimport * as Layer from \"effect/Layer\";\nimport * as Option from \"effect/Option\";\nimport * as Ref from \"effect/Ref\";\nimport * as Schema from \"effect/Schema\";\nimport * as String from \"effect/String\";\nimport { BundleFailedError, fromBundlerError } from \"./BuildError.js\";\nimport * as Bundler from \"./Bundler.js\";\nimport {\n InvalidDeclarationError,\n MissingImplFileError,\n MissingSpecFileError,\n ImplMissingDefaultLayerError,\n ImplMissingFunctionsError,\n ImplMissingMiddlewareError,\n RequiredMiddlewareError,\n ImplMissingSpecImportError,\n ImplNotFinalizedError,\n InvalidMiddlewareAttachmentError,\n SpecImportsServerError,\n SpecMissingDefaultGroupSpecError,\n} from \"./CodegenError.js\";\nimport { ConfectDirectory } from \"./ConfectDirectory.js\";\nimport { ImplModulePath } from \"./ImplModulePath.js\";\nimport { removePathExtension, toPosixPath } from \"./utils.js\";\n\nexport interface LeafModule {\n readonly relativePath: string;\n readonly pathSegments: readonly [string, ...string[]];\n readonly groupPathDot: string;\n readonly exportName: string;\n readonly specImportPath: string;\n}\n\nexport type LoadedLeafModule = LeafModule & {\n readonly spec: GroupSpec.AnyWithProps;\n} & Brand.Brand<\"@confect/cli/LoadedLeafModule\">;\n\nconst LoadedLeafModule = Brand.nominal<LoadedLeafModule>();\n\nconst VALIDATION_CONCURRENCY = 4;\n\nexport const SPEC_SUFFIX = \".spec.ts\";\nexport const IMPL_SUFFIX = \".impl.ts\";\n\nconst swapModuleSuffix = Effect.fnUntraced(function* (\n relativePath: string,\n fromSuffix: string,\n toSuffix: string,\n) {\n const path = yield* Path.Path;\n const { dir, name, ext } = path.parse(relativePath);\n if (ext !== \".ts\" || !name.endsWith(fromSuffix.slice(0, -\".ts\".length))) {\n return relativePath;\n }\n\n const stem = name.slice(0, -fromSuffix.slice(0, -\".ts\".length).length);\n const nextName = `${stem}${toSuffix.slice(0, -\".ts\".length)}`;\n return dir.length > 0\n ? path.join(dir, `${nextName}${ext}`)\n : `${nextName}${ext}`;\n});\n\nexport const isLeafSpecPath = (relativePath: string) =>\n relativePath.endsWith(SPEC_SUFFIX);\n\nexport const exportNameFromModulePath = Effect.fnUntraced(function* (\n relativePath: string,\n) {\n const path = yield* Path.Path;\n const { name, ext } = path.parse(relativePath);\n if (ext !== \".ts\") {\n return name;\n }\n return name.endsWith(\".spec\") ? name.slice(0, -\".spec\".length) : name;\n});\n\nexport const groupPathFromRelativeModulePath = Effect.fnUntraced(function* (\n relativePath: string,\n) {\n const path = yield* Path.Path;\n const { dir, name, ext } = path.parse(relativePath);\n const stem =\n ext === \".ts\" && name.endsWith(\".spec\")\n ? name.slice(0, -\".spec\".length)\n : name;\n const dirSegments = Array.filter(\n String.split(dir, path.sep),\n String.isNonEmpty,\n );\n const pathSegments = Array.append(dirSegments, stem) as [string, ...string[]];\n return {\n pathSegments,\n groupPathDot: Array.join(pathSegments, \".\"),\n };\n});\n\nexport const specImportPathFromGenerated = Effect.fnUntraced(function* (\n specRelativePath: string,\n) {\n const path = yield* Path.Path;\n const withoutExt = toPosixPath(\n path,\n yield* removePathExtension(specRelativePath),\n );\n return `../${withoutExt}.js`;\n});\n\nexport const specPathForImpl = (implRelativePath: string) =>\n swapModuleSuffix(implRelativePath, IMPL_SUFFIX, SPEC_SUFFIX);\n\nexport const implPathForSpec = (specRelativePath: string) =>\n swapModuleSuffix(specRelativePath, SPEC_SUFFIX, IMPL_SUFFIX);\n\nexport const registeredFunctionsRelativePath = Effect.fnUntraced(function* (\n leaf: LeafModule,\n) {\n const path = yield* Path.Path;\n return path.join(\"registeredFunctions\", ...leaf.pathSegments) + \".ts\";\n});\n\nexport const discoverLeafSpecFiles = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n\n const excludedDirs = HashSet.make(\"_generated\", \"tables\", \"middleware\");\n const excludedFiles = HashSet.make(\"nodeSpec.ts\", \"spec.ts\");\n\n const allPaths = yield* fs.readDirectory(confectDirectory, {\n recursive: true,\n });\n\n return Array.filter(allPaths, (relativePath) => {\n if (!isLeafSpecPath(relativePath)) {\n return false;\n }\n\n if (HashSet.has(excludedFiles, relativePath)) {\n return false;\n }\n\n const segments = String.split(relativePath, path.sep);\n return !Array.some(segments, (segment) =>\n HashSet.has(excludedDirs, segment),\n );\n });\n});\n\nexport const discoverLeafImplFiles = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n\n const excludedDirs = HashSet.make(\"_generated\", \"tables\", \"middleware\");\n\n const allPaths = yield* fs.readDirectory(confectDirectory, {\n recursive: true,\n });\n\n return Array.filter(\n Array.filterMap(allPaths, (relativePath) =>\n Schema.decodeResult(ImplModulePath)(relativePath),\n ),\n (relativePath) => {\n const segments = String.split(relativePath, path.sep);\n return !Array.some(segments, (segment) =>\n HashSet.has(excludedDirs, segment),\n );\n },\n );\n});\n\nexport const toLeafModule = Effect.fnUntraced(function* (\n specRelativePath: string,\n) {\n const exportName = yield* exportNameFromModulePath(specRelativePath);\n const { pathSegments, groupPathDot } =\n yield* groupPathFromRelativeModulePath(specRelativePath);\n const specImportPath = yield* specImportPathFromGenerated(specRelativePath);\n\n return {\n relativePath: specRelativePath,\n pathSegments,\n groupPathDot,\n exportName,\n specImportPath,\n } satisfies LeafModule;\n});\n\nconst absoluteModulePath = Effect.fnUntraced(function* (relativePath: string) {\n const confectDirectory = yield* ConfectDirectory.get;\n const path = yield* Path.Path;\n return path.resolve(confectDirectory, relativePath);\n});\n\n/**\n * Every `*.spec.ts` is reachable from `_generated/spec.ts`, which the client\n * imports through `_generated/refs.ts`—so a spec's whole import graph is\n * bundled into the browser whether or not the client calls those functions.\n * Server logic co-located with a declaration therefore ships to users,\n * silently.\n *\n * `@confect/server` is a sound proxy for \"server logic lives here\": an\n * implementation can't be written without `FunctionImpl`/`MiddlewareImpl`, both\n * of which live there. Table `Doc`/`Fields` schemas live in `@confect/core`, so\n * the documented `notes.Doc` pattern in a spec must not reach `@confect/server`\n * even through `tables/` or `_generated/`. The check runs over the spec\n * bundle's transitive inputs rather than the spec module alone, so it also\n * covers middleware declarations under `confect/middleware/` (which codegen\n * otherwise never visits) and any shared helper a spec pulls in—while only ever\n * flagging modules that genuinely reach the client.\n */\nconst validateClientSafety = Effect.fnUntraced(function* (\n leaf: LeafModule,\n bundled: Bundler.Bundled,\n) {\n const path = yield* Path.Path;\n const confectDirectory = path.resolve(yield* ConfectDirectory.get);\n\n const isCheckedUserModule = (absolutePath: string) => {\n const relative = path.relative(confectDirectory, absolutePath);\n return !relative.startsWith(\"..\") && !path.isAbsolute(relative);\n };\n\n const importers = Bundler.importersOfPackage(\n bundled,\n \"@confect/server\",\n isCheckedUserModule,\n );\n\n if (importers.length > 0) {\n return yield* new SpecImportsServerError({\n specPath: leaf.relativePath,\n importerPaths: Array.map(importers, (absolutePath) =>\n toPosixPath(path, path.relative(confectDirectory, absolutePath)),\n ),\n });\n }\n});\n\nconst validateReservedArguments = Effect.fnUntraced(function* (\n group: GroupSpec.AnyWithProps,\n specPath: string,\n groupPath: string,\n): Effect.fn.Return<void, InvalidDeclarationError> {\n for (const spec of Object.values(group.functions)) {\n const name = spec.reservedArgument;\n const provenance = spec.functionProvenance;\n if (\n name !== undefined &&\n provenance._tag === \"Confect\" &&\n Object.hasOwn(provenance.args.fields, name)\n ) {\n return yield* new InvalidDeclarationError({\n declarationPath: `confect/${specPath}`,\n reason: `${groupPath}:${spec.name} declares the argument \"${name}\", which its profile reserves. Rename the argument.`,\n });\n }\n }\n for (const [name, child] of Object.entries(group.groups)) {\n yield* validateReservedArguments(child, specPath, `${groupPath}/${name}`);\n }\n});\n\n/**\n * Validate that the leaf's spec file default-exports a `GroupSpec`, and that\n * nothing it reaches drags server code into the client (see\n * {@link validateClientSafety}). Returns the leaf paired with its validated\n * spec, so subsequent operations reuse that association without re-bundling.\n * The runtime is declared by the spec, not its file location.\n */\nexport const loadSpec = Effect.fn(\"LeafModule.loadSpec\")(function* (\n leaf: LeafModule,\n) {\n const absolutePath = yield* absoluteModulePath(leaf.relativePath);\n const bundled = yield* Bundler.bundle(absolutePath).pipe(\n Effect.mapError((error) => fromBundlerError(leaf.relativePath, error)),\n );\n\n const groupSpec = bundled.module.default;\n\n if (!GroupSpec.isGroupSpec(groupSpec)) {\n return yield* new SpecMissingDefaultGroupSpecError({\n specPath: leaf.relativePath,\n });\n }\n\n yield* validateClientSafety(leaf, bundled);\n yield* validateReservedArguments(\n groupSpec,\n leaf.relativePath,\n leaf.pathSegments.join(\"/\"),\n );\n\n yield* Effect.fromResult(GroupSpec.validateMiddleware(groupSpec)).pipe(\n Effect.mapError(\n (error) =>\n new InvalidMiddlewareAttachmentError({\n specPath: leaf.relativePath,\n message: MiddlewareAttachment.formatValidationError(error),\n }),\n ),\n );\n\n return LoadedLeafModule({\n ...leaf,\n spec: groupSpec,\n });\n});\n\n/**\n * Walk the built `Context` for a `Finalized` `GroupImpl` service value. The\n * lookup is value-shaped (via `GroupImpl.isFinalizedGroupImpl`) so we don't\n * need to know the group's path up front to construct a typed tag for it.\n */\nconst findFinalizedGroupImpl = <S>(\n context: Context.Context<S>,\n): Option.Option<GroupImpl.AnyFinalized> =>\n Array.findFirst(context.mapUnsafe.values(), GroupImpl.isFinalizedGroupImpl);\n\n/**\n * Build the impl layer with a fresh `Registry` so each validation is isolated\n * from prior validations' `FunctionImpl.make` writes. Retain its items to check\n * required middleware against actual function attachments.\n */\nconst buildImplLayer = Effect.fnUntraced(function* (\n implLayer: Layer.Layer<unknown>,\n) {\n const registry = Ref.makeUnsafe<RegistryItems.RegistryItems>({});\n const context = yield* Layer.build(\n implLayer as Layer.Layer<unknown, never, never>,\n ).pipe(Effect.provideService(Registry.Registry, registry));\n return { context, items: yield* Ref.get(registry) };\n}, Effect.scoped);\n\n/**\n * Validate that the leaf's sibling impl file imports the spec, default-exports\n * a finalized `GroupImpl` layer, and provides a `FunctionImpl` for every\n * function declared by the spec. Return uncovered middleware requirements for\n * the caller to report across groups.\n */\n/**\n * An implementation's unresolved import of a `confect/_generated` file is a\n * section file that no declared section writes: every declared section's file\n * is on disk before implementations validate. Say so, at the import.\n */\nconst nameUnwrittenSectionFiles = Effect.fnUntraced(function* (\n error: BundleFailedError,\n bundleDirectory: string,\n) {\n const path = yield* Path.Path;\n const generated = path.join(yield* ConfectDirectory.get, \"_generated\");\n const errors = (error.errors as ReadonlyArray<esbuild.Message>).map(\n (message) => {\n const specifier = /^Could not resolve \"(.+)\"$/.exec(message.text)?.[1];\n if (specifier === undefined || message.location === null) return message;\n const file = path.relative(\n generated,\n path.resolve(\n bundleDirectory,\n path.dirname(message.location.file),\n specifier,\n ),\n );\n if (file.startsWith(\"..\") || path.isAbsolute(file)) return message;\n const extension = path.extname(file);\n const name = toPosixPath(\n path,\n extension === \"\"\n ? `${file}.ts`\n : extension === \".js\"\n ? `${file.slice(0, -extension.length)}.ts`\n : file,\n );\n return Object.assign({}, message, {\n text: `No manifest section this backend declares writes _generated/${name}. Declare its section on App.make({ manifestSections }) in confect/app.ts.`,\n });\n },\n );\n return new BundleFailedError({ file: error.file, errors });\n});\n\nexport const validateImpl = Effect.fn(\"LeafModule.validateImpl\")(function* (\n leaf: LoadedLeafModule,\n required: ReadonlyArray<{ readonly key: string }> = [],\n) {\n const path = yield* Path.Path;\n const implRelativePath = yield* implPathForSpec(leaf.relativePath);\n const implAbsolutePath = yield* absoluteModulePath(implRelativePath);\n const specAbsolutePath = yield* absoluteModulePath(leaf.relativePath);\n\n const bundled = yield* Bundler.bundle(implAbsolutePath).pipe(\n Effect.mapError((error) => fromBundlerError(implRelativePath, error)),\n Effect.catchTag(\"BundleFailedError\", (error) =>\n Effect.flip(\n nameUnwrittenSectionFiles(error, path.dirname(implAbsolutePath)),\n ),\n ),\n );\n\n if (\n !(yield* Bundler.directlyImports(\n bundled,\n implAbsolutePath,\n specAbsolutePath,\n ))\n ) {\n return yield* new ImplMissingSpecImportError({\n implPath: implRelativePath,\n expectedSpecPath: leaf.relativePath,\n });\n }\n\n if (!Layer.isLayer(bundled.module.default)) {\n return yield* new ImplMissingDefaultLayerError({\n implPath: implRelativePath,\n });\n }\n\n const groupSpec = leaf.spec;\n const expectedFunctionNames = Object.keys(groupSpec.functions);\n\n const { context, items } = yield* buildImplLayer(\n bundled.module.default as Layer.Layer<unknown>,\n );\n const finalizedGroupImpl = yield* Option.match(\n findFinalizedGroupImpl(context),\n {\n onNone: () => new ImplNotFinalizedError({ implPath: implRelativePath }),\n onSome: Effect.succeed,\n },\n );\n\n const registeredSet = HashSet.fromIterable(\n finalizedGroupImpl.registeredFunctionNames,\n );\n const missing = expectedFunctionNames.filter(\n (name) => !HashSet.has(registeredSet, name),\n );\n\n if (missing.length > 0) {\n return yield* new ImplMissingFunctionsError({\n implPath: implRelativePath,\n groupPath: leaf.groupPathDot,\n missingFunctionNames: missing,\n });\n }\n\n const expectedMiddlewareKeys = Array.dedupe([\n ...(groupSpec.middlewareSpecs ?? []).map(\n (middlewareSpec) => middlewareSpec.key,\n ),\n ...Object.values(groupSpec.functions).flatMap((function_) =>\n (function_.middlewareSpecs ?? []).map(\n (middlewareSpec) => middlewareSpec.key,\n ),\n ),\n ]);\n const registeredMiddlewareKeys = HashSet.fromIterable(\n finalizedGroupImpl.registeredMiddlewareKeys ?? [],\n );\n const missingMiddleware = Array.filter(\n expectedMiddlewareKeys,\n (key) => !HashSet.has(registeredMiddlewareKeys, key),\n );\n\n if (missingMiddleware.length > 0) {\n return yield* new ImplMissingMiddlewareError({\n implPath: implRelativePath,\n groupPath: leaf.groupPathDot,\n missingMiddlewareKeys: missingMiddleware,\n });\n }\n\n return RegistryItems.missingRequired(items, required, leaf.groupPathDot);\n});\n\nexport const withImplFiles = Effect.fnUntraced(function* <A, E, R>(\n relativePaths: ReadonlyArray<ImplModulePath>,\n use: (leaves: ReadonlyArray<LoadedLeafModule>) => Effect.Effect<A, E, R>,\n) {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n const pairs = yield* Effect.forEach(relativePaths, (implRelativePath) =>\n specPathForImpl(implRelativePath).pipe(\n Effect.map((specRelativePath) => ({\n implRelativePath,\n specRelativePath,\n })),\n ),\n );\n\n return yield* Bundler.withBatch(\n pairs.flatMap(({ implRelativePath, specRelativePath }) => [\n path.resolve(confectDirectory, implRelativePath),\n path.resolve(confectDirectory, specRelativePath),\n ]),\n Effect.gen(function* () {\n const leaves = yield* Effect.forEach(\n pairs,\n Effect.fnUntraced(function* ({ implRelativePath, specRelativePath }) {\n if (\n !(yield* fs.exists(path.join(confectDirectory, specRelativePath)))\n ) {\n return yield* new MissingSpecFileError({\n implPath: implRelativePath,\n expectedSpecPath: specRelativePath,\n });\n }\n if (\n !(yield* fs.exists(path.join(confectDirectory, implRelativePath)))\n ) {\n return yield* new MissingImplFileError({\n specPath: specRelativePath,\n expectedImplPath: implRelativePath,\n });\n }\n const leaf = yield* loadSpec(yield* toLeafModule(specRelativePath));\n return leaf;\n }),\n { concurrency: VALIDATION_CONCURRENCY },\n );\n return yield* use(leaves);\n }),\n );\n});\n\nexport const validateImplFiles = Effect.fn(\"LeafModule.validateImplFiles\")(\n (relativePaths: ReadonlyArray<ImplModulePath>) =>\n withImplFiles(relativePaths, validateAllImpls),\n);\n\nexport const validateAllImpls = Effect.fnUntraced(function* (\n leaves: ReadonlyArray<LoadedLeafModule>,\n required: ReadonlyArray<{ readonly key: string }> = [],\n) {\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n const implementationPaths = yield* Effect.forEach(\n leaves,\n ({ relativePath }) =>\n implPathForSpec(relativePath).pipe(\n Effect.map((implPath) => path.resolve(confectDirectory, implPath)),\n ),\n );\n const missing = (yield* Bundler.withBatch(\n implementationPaths,\n Effect.forEach(leaves, (leaf) => validateImpl(leaf, required), {\n concurrency: VALIDATION_CONCURRENCY,\n }),\n ))\n .flat()\n .sort((left, right) => left.functionName.localeCompare(right.functionName));\n if (missing.length > 0) {\n return yield* new RequiredMiddlewareError({ missing });\n }\n});\n\nexport const loadAll = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n const specFiles = yield* discoverLeafSpecFiles;\n\n const results = yield* Bundler.withBatch(\n specFiles.map((relativePath) =>\n path.resolve(confectDirectory, relativePath),\n ),\n Effect.forEach(\n specFiles,\n Effect.fnUntraced(function* (specRelativePath: string) {\n const discovered = yield* toLeafModule(specRelativePath);\n const leaf = yield* loadSpec(discovered);\n\n const implRelativePath = yield* implPathForSpec(specRelativePath);\n const implAbsolutePath = path.join(confectDirectory, implRelativePath);\n if (!(yield* fs.exists(implAbsolutePath))) {\n return yield* new MissingImplFileError({\n specPath: specRelativePath,\n expectedImplPath: implRelativePath,\n });\n }\n\n return leaf;\n }),\n { concurrency: VALIDATION_CONCURRENCY },\n ),\n );\n\n yield* validateOrphanImpls(specFiles);\n\n return results;\n});\n\n/**\n * Walk leaf ancestors and fail with a {@link ParentChildNameCollisionError} when\n * a parent leaf declares a function or subgroup whose name matches a sibling\n * subdirectory spec's segment. Without this check the colliding descendant\n * would overwrite the parent's entry in the assembled `GroupSpec.groups` map at\n * runtime, surfacing as a confusing `Refs.make` error rather than a\n * codegen-time diagnostic.\n */\nconst validateOrphanImpls = Effect.fnUntraced(function* (\n specFiles: ReadonlyArray<string>,\n) {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n const implFiles = yield* discoverLeafImplFiles;\n const specPaths = HashSet.fromIterable(specFiles);\n\n yield* Effect.forEach(\n implFiles,\n Effect.fnUntraced(function* (implRelativePath: string) {\n const specRelativePath = yield* specPathForImpl(implRelativePath);\n if (HashSet.has(specPaths, specRelativePath)) {\n return;\n }\n\n const specAbsolutePath = path.join(confectDirectory, specRelativePath);\n if (!(yield* fs.exists(specAbsolutePath))) {\n return yield* new MissingSpecFileError({\n implPath: implRelativePath,\n expectedSpecPath: specRelativePath,\n });\n }\n }),\n );\n});\n"],"mappings":"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"}
|
|
@@ -27,43 +27,68 @@ const json = (value) => {
|
|
|
27
27
|
return path === void 0 ? Result.succeed(JSON.parse(JSON.stringify(value))) : Result.fail(`Expected JSON data at ${path}`);
|
|
28
28
|
};
|
|
29
29
|
const hasFormat = (format) => Schema.is(Schema.Struct({ format: Schema.Literal(format) }));
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
};
|
|
51
|
-
registry.set(key, entry);
|
|
52
|
-
const description = yield* Result.try({
|
|
53
|
-
try: () => section.describe({
|
|
54
|
-
path: functionPath,
|
|
55
|
-
spec,
|
|
56
|
-
middleware: [...group.middlewareSpecs, ...spec.middlewareSpecs]
|
|
57
|
-
}),
|
|
58
|
-
catch: (cause) => invalid(String(cause))
|
|
59
|
-
});
|
|
60
|
-
entry.data.functions[functionPath] = yield* Result.mapError(json(description), (reason) => invalid(`could not describe as JSON: ${reason}`));
|
|
61
|
-
entry.sources[functionPath] = source;
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
for (const [name, child] of Object.entries(group.groups)) yield* visit(child, `${path}/${name}`, source);
|
|
30
|
+
const appDeclaration = (reason) => new InvalidDeclarationError({
|
|
31
|
+
declarationPath: "confect/app.ts",
|
|
32
|
+
reason
|
|
33
|
+
});
|
|
34
|
+
/**
|
|
35
|
+
* Refuse a key `App.make` declares twice or that shadows one the manifest keeps
|
|
36
|
+
* for itself.
|
|
37
|
+
*/
|
|
38
|
+
const declared = (entries) => Result.gen(function* () {
|
|
39
|
+
const seen = /* @__PURE__ */ new Set();
|
|
40
|
+
for (const { key } of entries) {
|
|
41
|
+
if (reserved.has(key)) return yield* Result.fail(appDeclaration(`Manifest section "${key}" shadows a built-in key.`));
|
|
42
|
+
if (seen.has(key)) return yield* Result.fail(appDeclaration(`Manifest section "${key}" is declared twice.`));
|
|
43
|
+
seen.add(key);
|
|
44
|
+
}
|
|
45
|
+
});
|
|
46
|
+
const visit = (leaves, each) => Result.gen(function* () {
|
|
47
|
+
const walk = (group, path, source) => Result.gen(function* () {
|
|
48
|
+
for (const spec of Object.values(group.functions)) yield* each(spec, group, `${path}:${spec.name}`, source);
|
|
49
|
+
for (const [name, child] of Object.entries(group.groups)) yield* walk(child, `${path}/${name}`, source);
|
|
65
50
|
});
|
|
66
|
-
for (const leaf of leaves) yield*
|
|
51
|
+
for (const leaf of leaves) yield* walk(leaf.spec, leaf.pathSegments.join("/"), leaf.relativePath);
|
|
52
|
+
});
|
|
53
|
+
/**
|
|
54
|
+
* Refuse a function spec that still carries `manifestSections`: codegen reads a
|
|
55
|
+
* backend's sections only from `App.make`.
|
|
56
|
+
*/
|
|
57
|
+
const refuseSpecSections = (leaves) => visit(leaves, (spec, _, path, source) => Predicate.hasProperty(spec, "manifestSections") ? Result.fail(new InvalidDeclarationError({
|
|
58
|
+
declarationPath: `confect/${source}`,
|
|
59
|
+
reason: `${path} carries manifestSections, which codegen no longer reads from a function spec. Declare the backend's manifest sections once, on App.make({ manifestSections }) in confect/app.ts.`
|
|
60
|
+
})) : Result.void);
|
|
61
|
+
/**
|
|
62
|
+
* One registry entry per declared section, each describing every registered
|
|
63
|
+
* function. A backend with no functions keeps every section, with none.
|
|
64
|
+
*/
|
|
65
|
+
const collect = (entries, leaves) => Result.gen(function* () {
|
|
66
|
+
const registry = new Map(entries.map(({ key, section }) => [key, {
|
|
67
|
+
section,
|
|
68
|
+
data: {
|
|
69
|
+
format: section.format,
|
|
70
|
+
functions: Object.create(null)
|
|
71
|
+
},
|
|
72
|
+
sources: Object.create(null)
|
|
73
|
+
}]));
|
|
74
|
+
yield* visit(leaves, (spec, group, functionPath, source) => Result.gen(function* () {
|
|
75
|
+
for (const [key, { section, data, sources }] of registry) {
|
|
76
|
+
const invalid = (reason) => new InvalidDeclarationError({
|
|
77
|
+
declarationPath: `confect/${source}`,
|
|
78
|
+
reason: `Manifest section "${key}" (${functionPath}): ${reason}`
|
|
79
|
+
});
|
|
80
|
+
const description = yield* Result.try({
|
|
81
|
+
try: () => section.describe({
|
|
82
|
+
path: functionPath,
|
|
83
|
+
spec,
|
|
84
|
+
middleware: [...group.middlewareSpecs, ...spec.middlewareSpecs]
|
|
85
|
+
}),
|
|
86
|
+
catch: (cause) => invalid(String(cause))
|
|
87
|
+
});
|
|
88
|
+
data.functions[functionPath] = yield* Result.mapError(json(description), (reason) => invalid(`could not describe as JSON: ${reason}`));
|
|
89
|
+
sources[functionPath] = source;
|
|
90
|
+
}
|
|
91
|
+
}));
|
|
67
92
|
return registry;
|
|
68
93
|
});
|
|
69
94
|
/**
|
|
@@ -113,13 +138,12 @@ const check = (registry, previous) => {
|
|
|
113
138
|
reason: `check failed: ${String(cause)}`
|
|
114
139
|
}));
|
|
115
140
|
}
|
|
116
|
-
for (const [key, value] of Object.entries(previous)) if (!reserved.has(key) && !registry.has(key) && Predicate.isObjectOrArray(value) && "functions" in value && Predicate.isObjectOrArray(value.functions)) notes.push(`Manifest section "${key}" no longer has participants. Previous functions: ${Object.keys(value.functions).join(", ")}.`);
|
|
117
141
|
return {
|
|
118
142
|
errors,
|
|
119
143
|
notes
|
|
120
144
|
};
|
|
121
145
|
};
|
|
122
146
|
//#endregion
|
|
123
|
-
export { check, collect, sections, summarize };
|
|
147
|
+
export { check, collect, declared, refuseSpecSections, sections, summarize };
|
|
124
148
|
|
|
125
149
|
//# sourceMappingURL=ManifestSections.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManifestSections.mjs","names":[],"sources":["../src/ManifestSections.ts"],"sourcesContent":["import type { GroupSpec, ManifestSection } from \"@confect/core\";\nimport * as Predicate from \"effect/Predicate\";\nimport * as Result from \"effect/Result\";\nimport * as Schema from \"effect/Schema\";\nimport type { LoadedLeafModule } from \"./LeafModule.js\";\nimport {\n InvalidDeclarationError,\n InvalidManifestSectionError,\n} from \"./CodegenError.js\";\n\nconst reserved = new Set(\n \"name env http digest __proto__ constructor prototype\".split(\" \"),\n);\nexport const sections = (manifest: Readonly<Record<string, unknown>>) =>\n Object.fromEntries(\n Object.entries(manifest).filter(([key]) => !reserved.has(key)),\n );\n// Read only property descriptors, through static functions, so no getter,\n// `toJSON` or other method of the input runs before the check and nothing\n// `JSON.stringify` would call, skip or convert passes.\nconst nonJsonPath = (\n value: unknown,\n path = \"$\",\n ancestors: ReadonlyArray<object> = [],\n): string | undefined => {\n if (value === null || [\"string\", \"boolean\"].includes(typeof value))\n return undefined;\n if (typeof value === \"number\")\n return Number.isFinite(value) ? undefined : path;\n if (typeof value !== \"object\" || ancestors.includes(value)) return path;\n const isArray = Array.isArray(value);\n const prototypes = isArray ? [Array.prototype] : [Object.prototype, null];\n if (!prototypes.includes(Object.getPrototypeOf(value))) return path;\n const keys = isArray\n ? Array.from(\n { length: Object.getOwnPropertyDescriptor(value, \"length\")?.value },\n (_, index) => String(index),\n )\n : Reflect.ownKeys(value);\n for (const key of keys) {\n if (typeof key === \"symbol\") return path;\n const at = `${path}[${JSON.stringify(key)}]`;\n const descriptor = Object.getOwnPropertyDescriptor(value, key);\n if (\n key === \"__proto__\" ||\n !descriptor?.enumerable ||\n !(\"value\" in descriptor)\n )\n return at;\n const found = nonJsonPath(descriptor.value, at, [...ancestors, value]);\n if (found !== undefined) return found;\n }\n // Every index is an own data property by now, so any other key than `length`\n // is one `JSON.stringify` would drop or call.\n return isArray && Reflect.ownKeys(value).length !== keys.length + 1\n ? path\n : undefined;\n};\nconst json = (value: unknown): Result.Result<unknown, string> => {\n const path = nonJsonPath(value);\n return path === undefined\n ? Result.succeed(JSON.parse(JSON.stringify(value)))\n : Result.fail(`Expected JSON data at ${path}`);\n};\nexport type Registry = Map<\n string,\n {\n section: ManifestSection.Any;\n data: { format: number; functions: Record<string, unknown> };\n sources: Record<string, string>;\n }\n>;\nconst hasFormat = (format: number) =>\n Schema.is(Schema.Struct({ format: Schema.Literal(format) }));\ntype Summarized = {\n readonly section: ManifestSection.Any;\n readonly data: { readonly format: number };\n};\n\nexport const collect = (\n leaves: ReadonlyArray<\n Pick<LoadedLeafModule, \"spec\" | \"pathSegments\" | \"relativePath\">\n >,\n) =>\n Result.gen(function* () {\n const registry: Registry = new Map();\n const visit = (\n group: GroupSpec.AnyWithProps,\n path: string,\n source: string,\n ): Result.Result<void, InvalidDeclarationError> =>\n Result.gen(function* () {\n for (const spec of Object.values(group.functions)) {\n const functionPath = `${path}:${spec.name}`;\n for (const { key, section } of spec.manifestSections ?? []) {\n const invalid = (reason: string) =>\n new InvalidDeclarationError({\n declarationPath: `confect/${source}`,\n reason: `Manifest section \"${key}\" (${functionPath}): ${reason}`,\n });\n if (reserved.has(key))\n return yield* Result.fail(invalid(\"shadows a built-in key.\"));\n const existing = registry.get(key);\n if (\n existing !== undefined &&\n (existing.section.owner !== section.owner ||\n existing.section.format !== section.format)\n )\n return yield* Result.fail(\n invalid(\n `conflicts between ${existing.section.owner} (format ${existing.section.format}) and ${section.owner} (format ${section.format}).`,\n ),\n );\n const entry = existing ?? {\n section,\n data: {\n format: section.format,\n functions: Object.create(null) as Record<string, unknown>,\n },\n sources: Object.create(null) as Record<string, string>,\n };\n registry.set(key, entry);\n const description = yield* Result.try({\n try: () =>\n section.describe({\n path: functionPath,\n spec,\n middleware: [\n ...group.middlewareSpecs,\n ...spec.middlewareSpecs,\n ],\n }),\n catch: (cause) => invalid(String(cause)),\n });\n entry.data.functions[functionPath] = yield* Result.mapError(\n json(description),\n (reason) => invalid(`could not describe as JSON: ${reason}`),\n );\n entry.sources[functionPath] = source;\n }\n }\n for (const [name, child] of Object.entries(group.groups))\n yield* visit(child, `${path}/${name}`, source);\n });\n for (const leaf of leaves)\n yield* visit(leaf.spec, leaf.pathSegments.join(\"/\"), leaf.relativePath);\n return registry;\n });\n\n/**\n * Replace the data of each section that has `summarize` with what it returns\n * from its matched modules, its functions' descriptions and their spec files.\n */\nexport const summarize = (\n registry: Registry,\n modules: ReadonlyMap<string, ManifestSection.GenerateInput[\"modules\"]>,\n) =>\n Result.gen(function* () {\n const summarized = new Map<string, Summarized>(registry);\n for (const [key, { section, data, sources }] of registry) {\n if (section.summarize === undefined) continue;\n const input = {\n modules: modules.get(key) ?? [],\n functions: data.functions,\n sources,\n };\n const invalid = (reason: string) =>\n new InvalidManifestSectionError({ sectionKey: key, reason });\n const summary = yield* Result.try({\n try: () => section.summarize?.(input),\n catch: (cause) => invalid(`summarize failed: ${String(cause)}`),\n });\n const parsed = yield* Result.mapError(json(summary), (reason) =>\n invalid(`could not summarize as JSON: ${reason}`),\n );\n if (!hasFormat(section.format)(parsed))\n return yield* Result.fail(\n invalid(`summarize must return data with format ${section.format}.`),\n );\n summarized.set(key, { section, data: parsed });\n }\n return summarized;\n });\n\nexport const check = (\n registry: ReadonlyMap<string, Summarized>,\n previous: Readonly<Record<string, unknown>>,\n) => {\n const errors: InvalidManifestSectionError[] = [];\n const notes: string[] = [];\n for (const [key, { section, data }] of registry) {\n try {\n const checked = section.check?.(data, previous[key]);\n if (checked === undefined) continue;\n notes.push(...checked.notes);\n if (checked.errors.length > 0)\n errors.push(\n new InvalidManifestSectionError({\n sectionKey: key,\n reason: [...new Set(checked.errors)].join(\"\\n\"),\n }),\n );\n } catch (cause) {\n errors.push(\n new InvalidManifestSectionError({\n sectionKey: key,\n reason: `check failed: ${String(cause)}`,\n }),\n );\n }\n }\n for (const [key, value] of Object.entries(previous)) {\n if (\n !reserved.has(key) &&\n !registry.has(key) &&\n Predicate.isObjectOrArray(value) &&\n \"functions\" in value &&\n Predicate.isObjectOrArray(value.functions)\n )\n notes.push(\n `Manifest section \"${key}\" no longer has participants. Previous functions: ${Object.keys(value.functions).join(\", \")}.`,\n );\n }\n return { errors, notes };\n};\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ManifestSections.mjs","names":[],"sources":["../src/ManifestSections.ts"],"sourcesContent":["import type { FunctionSpec, GroupSpec, ManifestSection } from \"@confect/core\";\nimport * as Predicate from \"effect/Predicate\";\nimport * as Result from \"effect/Result\";\nimport * as Schema from \"effect/Schema\";\nimport type { LoadedLeafModule } from \"./LeafModule.js\";\nimport {\n InvalidDeclarationError,\n InvalidManifestSectionError,\n} from \"./CodegenError.js\";\n\nconst reserved = new Set(\n \"name env http digest __proto__ constructor prototype\".split(\" \"),\n);\nexport const sections = (manifest: Readonly<Record<string, unknown>>) =>\n Object.fromEntries(\n Object.entries(manifest).filter(([key]) => !reserved.has(key)),\n );\n// Read only property descriptors, through static functions, so no getter,\n// `toJSON` or other method of the input runs before the check and nothing\n// `JSON.stringify` would call, skip or convert passes.\nconst nonJsonPath = (\n value: unknown,\n path = \"$\",\n ancestors: ReadonlyArray<object> = [],\n): string | undefined => {\n if (value === null || [\"string\", \"boolean\"].includes(typeof value))\n return undefined;\n if (typeof value === \"number\")\n return Number.isFinite(value) ? undefined : path;\n if (typeof value !== \"object\" || ancestors.includes(value)) return path;\n const isArray = Array.isArray(value);\n const prototypes = isArray ? [Array.prototype] : [Object.prototype, null];\n if (!prototypes.includes(Object.getPrototypeOf(value))) return path;\n const keys = isArray\n ? Array.from(\n { length: Object.getOwnPropertyDescriptor(value, \"length\")?.value },\n (_, index) => String(index),\n )\n : Reflect.ownKeys(value);\n for (const key of keys) {\n if (typeof key === \"symbol\") return path;\n const at = `${path}[${JSON.stringify(key)}]`;\n const descriptor = Object.getOwnPropertyDescriptor(value, key);\n if (\n key === \"__proto__\" ||\n !descriptor?.enumerable ||\n !(\"value\" in descriptor)\n )\n return at;\n const found = nonJsonPath(descriptor.value, at, [...ancestors, value]);\n if (found !== undefined) return found;\n }\n // Every index is an own data property by now, so any other key than `length`\n // is one `JSON.stringify` would drop or call.\n return isArray && Reflect.ownKeys(value).length !== keys.length + 1\n ? path\n : undefined;\n};\nconst json = (value: unknown): Result.Result<unknown, string> => {\n const path = nonJsonPath(value);\n return path === undefined\n ? Result.succeed(JSON.parse(JSON.stringify(value)))\n : Result.fail(`Expected JSON data at ${path}`);\n};\nexport type Registry = Map<\n string,\n {\n section: ManifestSection.Any;\n data: { format: number; functions: Record<string, unknown> };\n sources: Record<string, string>;\n }\n>;\nconst hasFormat = (format: number) =>\n Schema.is(Schema.Struct({ format: Schema.Literal(format) }));\ntype Summarized = {\n readonly section: ManifestSection.Any;\n readonly data: { readonly format: number };\n};\n\ntype Leaf = Pick<LoadedLeafModule, \"spec\" | \"pathSegments\" | \"relativePath\">;\n\nconst appDeclaration = (reason: string) =>\n new InvalidDeclarationError({ declarationPath: \"confect/app.ts\", reason });\n\n/**\n * Refuse a key `App.make` declares twice or that shadows one the manifest keeps\n * for itself.\n */\nexport const declared = (entries: ReadonlyArray<ManifestSection.Entry>) =>\n Result.gen(function* () {\n const seen = new Set<string>();\n for (const { key } of entries) {\n if (reserved.has(key))\n return yield* Result.fail(\n appDeclaration(`Manifest section \"${key}\" shadows a built-in key.`),\n );\n if (seen.has(key))\n return yield* Result.fail(\n appDeclaration(`Manifest section \"${key}\" is declared twice.`),\n );\n seen.add(key);\n }\n });\n\nconst visit = (\n leaves: ReadonlyArray<Leaf>,\n each: (\n spec: FunctionSpec.AnyWithProps,\n group: GroupSpec.AnyWithProps,\n path: string,\n source: string,\n ) => Result.Result<void, InvalidDeclarationError>,\n) =>\n Result.gen(function* () {\n const walk = (\n group: GroupSpec.AnyWithProps,\n path: string,\n source: string,\n ): Result.Result<void, InvalidDeclarationError> =>\n Result.gen(function* () {\n for (const spec of Object.values(group.functions))\n yield* each(spec, group, `${path}:${spec.name}`, source);\n for (const [name, child] of Object.entries(group.groups))\n yield* walk(child, `${path}/${name}`, source);\n });\n for (const leaf of leaves)\n yield* walk(leaf.spec, leaf.pathSegments.join(\"/\"), leaf.relativePath);\n });\n\n/**\n * Refuse a function spec that still carries `manifestSections`: codegen reads a\n * backend's sections only from `App.make`.\n */\nexport const refuseSpecSections = (leaves: ReadonlyArray<Leaf>) =>\n visit(leaves, (spec, _, path, source) =>\n Predicate.hasProperty(spec, \"manifestSections\")\n ? Result.fail(\n new InvalidDeclarationError({\n declarationPath: `confect/${source}`,\n reason: `${path} carries manifestSections, which codegen no longer reads from a function spec. Declare the backend's manifest sections once, on App.make({ manifestSections }) in confect/app.ts.`,\n }),\n )\n : Result.void,\n );\n\n/**\n * One registry entry per declared section, each describing every registered\n * function. A backend with no functions keeps every section, with none.\n */\nexport const collect = (\n entries: ReadonlyArray<ManifestSection.Entry>,\n leaves: ReadonlyArray<Leaf>,\n) =>\n Result.gen(function* () {\n const registry: Registry = new Map(\n entries.map(({ key, section }) => [\n key,\n {\n section,\n data: {\n format: section.format,\n functions: Object.create(null) as Record<string, unknown>,\n },\n sources: Object.create(null) as Record<string, string>,\n },\n ]),\n );\n yield* visit(leaves, (spec, group, functionPath, source) =>\n Result.gen(function* () {\n for (const [key, { section, data, sources }] of registry) {\n const invalid = (reason: string) =>\n new InvalidDeclarationError({\n declarationPath: `confect/${source}`,\n reason: `Manifest section \"${key}\" (${functionPath}): ${reason}`,\n });\n const description = yield* Result.try({\n try: () =>\n section.describe({\n path: functionPath,\n spec,\n middleware: [...group.middlewareSpecs, ...spec.middlewareSpecs],\n }),\n catch: (cause) => invalid(String(cause)),\n });\n data.functions[functionPath] = yield* Result.mapError(\n json(description),\n (reason) => invalid(`could not describe as JSON: ${reason}`),\n );\n sources[functionPath] = source;\n }\n }),\n );\n return registry;\n });\n\n/**\n * Replace the data of each section that has `summarize` with what it returns\n * from its matched modules, its functions' descriptions and their spec files.\n */\nexport const summarize = (\n registry: Registry,\n modules: ReadonlyMap<string, ManifestSection.GenerateInput[\"modules\"]>,\n) =>\n Result.gen(function* () {\n const summarized = new Map<string, Summarized>(registry);\n for (const [key, { section, data, sources }] of registry) {\n if (section.summarize === undefined) continue;\n const input = {\n modules: modules.get(key) ?? [],\n functions: data.functions,\n sources,\n };\n const invalid = (reason: string) =>\n new InvalidManifestSectionError({ sectionKey: key, reason });\n const summary = yield* Result.try({\n try: () => section.summarize?.(input),\n catch: (cause) => invalid(`summarize failed: ${String(cause)}`),\n });\n const parsed = yield* Result.mapError(json(summary), (reason) =>\n invalid(`could not summarize as JSON: ${reason}`),\n );\n if (!hasFormat(section.format)(parsed))\n return yield* Result.fail(\n invalid(`summarize must return data with format ${section.format}.`),\n );\n summarized.set(key, { section, data: parsed });\n }\n return summarized;\n });\n\nexport const check = (\n registry: ReadonlyMap<string, Summarized>,\n previous: Readonly<Record<string, unknown>>,\n) => {\n const errors: InvalidManifestSectionError[] = [];\n const notes: string[] = [];\n for (const [key, { section, data }] of registry) {\n try {\n const checked = section.check?.(data, previous[key]);\n if (checked === undefined) continue;\n notes.push(...checked.notes);\n if (checked.errors.length > 0)\n errors.push(\n new InvalidManifestSectionError({\n sectionKey: key,\n reason: [...new Set(checked.errors)].join(\"\\n\"),\n }),\n );\n } catch (cause) {\n errors.push(\n new InvalidManifestSectionError({\n sectionKey: key,\n reason: `check failed: ${String(cause)}`,\n }),\n );\n }\n }\n return { errors, notes };\n};\n"],"mappings":"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"}
|
package/dist/SectionFiles.mjs
CHANGED
|
@@ -4,6 +4,7 @@ import { bundle } from "./Bundler.mjs";
|
|
|
4
4
|
import { InvalidManifestSectionError, logCodegenError } from "./CodegenError.mjs";
|
|
5
5
|
import { ConfectDirectory } from "./ConfectDirectory.mjs";
|
|
6
6
|
import { removePathIfExists, toPosixPath, writeFileStringAndLog } from "./utils.mjs";
|
|
7
|
+
import { componentConfigPlugin } from "./ConvexConfig.mjs";
|
|
7
8
|
import * as Effect from "effect/Effect";
|
|
8
9
|
import * as FileSystem from "effect/FileSystem";
|
|
9
10
|
import * as Path from "effect/Path";
|
|
@@ -24,6 +25,7 @@ const Sources = Schema.fromJsonString(Schema.Array(Schema.String));
|
|
|
24
25
|
const encodeSources = Schema.encodeSync(Sources);
|
|
25
26
|
const decodeSources = Schema.decodeUnknownOption(Sources);
|
|
26
27
|
const INPUTS = "sectionInputs.json";
|
|
28
|
+
const VERIFY_INPUTS = "verifyInputs.json";
|
|
27
29
|
const visit = (leaves, each) => {
|
|
28
30
|
const walk = (group, path, source) => {
|
|
29
31
|
for (const spec of Object.values(group.functions)) each(spec, `${path}:${spec.name}`, source);
|
|
@@ -32,15 +34,13 @@ const visit = (leaves, each) => {
|
|
|
32
34
|
for (const leaf of leaves) walk(leaf.spec, leaf.pathSegments.join("/"), leaf.relativePath);
|
|
33
35
|
};
|
|
34
36
|
/**
|
|
35
|
-
* One claim per section
|
|
36
|
-
* is built in, not a `.ts` file directly in `_generated`, or claimed by
|
|
37
|
-
* keys is refused.
|
|
37
|
+
* One claim per declared section that generates a file, ordered by file. A name
|
|
38
|
+
* that is built in, not a `.ts` file directly in `_generated`, or claimed by
|
|
39
|
+
* two keys is refused.
|
|
38
40
|
*/
|
|
39
|
-
const claims = (
|
|
41
|
+
const claims = (sections) => Result.gen(function* () {
|
|
40
42
|
const byKey = /* @__PURE__ */ new Map();
|
|
41
|
-
|
|
42
|
-
for (const { key, section } of spec.manifestSections ?? []) if (section.generate !== void 0 && !byKey.has(key)) byKey.set(key, section.generate);
|
|
43
|
-
});
|
|
43
|
+
for (const { key, section } of sections) if (section.generate !== void 0) byKey.set(key, section.generate);
|
|
44
44
|
const byFile = /* @__PURE__ */ new Map();
|
|
45
45
|
for (const [key, { file }] of byKey) {
|
|
46
46
|
const other = byFile.get(file);
|
|
@@ -62,33 +62,54 @@ const sourceFiles = Effect.gen(function* () {
|
|
|
62
62
|
const confectDirectory = yield* ConfectDirectory.get;
|
|
63
63
|
return (yield* fs.readDirectory(confectDirectory, { recursive: true })).map((file) => toPosixPath(path, file)).filter((file) => file.endsWith(".ts") && !file.endsWith(".d.ts") && !file.split("/").includes("_generated")).sort();
|
|
64
64
|
});
|
|
65
|
-
|
|
65
|
+
/**
|
|
66
|
+
* Bundle each matched `confect/` file and return its exports, adding it and
|
|
67
|
+
* every first-party file it imports to `watched`.
|
|
68
|
+
*/
|
|
69
|
+
const load = Effect.fnUntraced(function* (matched, watched, plugins = []) {
|
|
66
70
|
const path = yield* Path.Path;
|
|
67
71
|
const confectDirectory = yield* ConfectDirectory.get;
|
|
68
|
-
const failed = (cause) => new InvalidManifestSectionError({
|
|
69
|
-
sectionKey: key,
|
|
70
|
-
reason: `generate failed: ${String(cause)}`
|
|
71
|
-
});
|
|
72
|
-
const matched = yield* Effect.try({
|
|
73
|
-
try: () => input.files.filter((file) => generate.match(file)),
|
|
74
|
-
catch: failed
|
|
75
|
-
});
|
|
76
72
|
for (const file of matched) watched.add(file);
|
|
77
|
-
|
|
73
|
+
return yield* Effect.forEach(matched, (relativePath) => {
|
|
78
74
|
const entry = path.join(confectDirectory, relativePath);
|
|
79
|
-
|
|
75
|
+
const recordInputs = {
|
|
80
76
|
name: "confect:section-inputs",
|
|
81
77
|
setup: (build) => build.onEnd(({ metafile }) => {
|
|
82
78
|
for (const loaded of Object.keys(metafile?.inputs ?? {})) {
|
|
79
|
+
if (/^[^/\\]+:/.test(loaded) && !path.isAbsolute(loaded)) continue;
|
|
83
80
|
const file = toPosixPath(path, path.relative(confectDirectory, path.resolve(path.dirname(entry), loaded)));
|
|
84
81
|
if (!file.startsWith("../") && !file.startsWith("_generated/")) watched.add(file);
|
|
85
82
|
}
|
|
86
83
|
})
|
|
87
|
-
}
|
|
84
|
+
};
|
|
85
|
+
return bundle(entry, { plugins: [...plugins, recordInputs] }).pipe(Effect.map(({ module }) => ({
|
|
88
86
|
relativePath,
|
|
89
87
|
exports: module
|
|
90
88
|
})), Effect.mapError((error) => fromBundlerError(`confect/${relativePath}`, error)));
|
|
91
89
|
});
|
|
90
|
+
});
|
|
91
|
+
/**
|
|
92
|
+
* Fail with the first of a section's refusals after logging the rest.
|
|
93
|
+
*/
|
|
94
|
+
const refuse = Effect.fnUntraced(function* (key, reasons) {
|
|
95
|
+
const [error, ...more] = reasons.map((reason) => new InvalidManifestSectionError({
|
|
96
|
+
sectionKey: key,
|
|
97
|
+
reason
|
|
98
|
+
}));
|
|
99
|
+
for (const other of more) yield* logCodegenError(other);
|
|
100
|
+
if (error !== void 0) return yield* error;
|
|
101
|
+
});
|
|
102
|
+
const render = Effect.fnUntraced(function* ({ key, generate }, target, input, watched) {
|
|
103
|
+
const confectDirectory = yield* ConfectDirectory.get;
|
|
104
|
+
const failed = (cause) => new InvalidManifestSectionError({
|
|
105
|
+
sectionKey: key,
|
|
106
|
+
reason: `generate failed: ${String(cause)}`
|
|
107
|
+
});
|
|
108
|
+
const matched = yield* Effect.try({
|
|
109
|
+
try: () => input.files.filter((file) => generate.match(file)),
|
|
110
|
+
catch: failed
|
|
111
|
+
});
|
|
112
|
+
const modules = yield* load(matched, watched);
|
|
92
113
|
const { contents, errors } = yield* Effect.try({
|
|
93
114
|
try: () => generate.render({
|
|
94
115
|
...input,
|
|
@@ -98,12 +119,7 @@ const render = Effect.fnUntraced(function* ({ key, generate }, target, input, wa
|
|
|
98
119
|
}),
|
|
99
120
|
catch: failed
|
|
100
121
|
});
|
|
101
|
-
|
|
102
|
-
sectionKey: key,
|
|
103
|
-
reason
|
|
104
|
-
}));
|
|
105
|
-
for (const other of more) yield* logCodegenError(other);
|
|
106
|
-
if (error !== void 0) return yield* error;
|
|
122
|
+
yield* refuse(key, errors);
|
|
107
123
|
return {
|
|
108
124
|
modules,
|
|
109
125
|
contents: [
|
|
@@ -123,32 +139,34 @@ const written = Effect.gen(function* () {
|
|
|
123
139
|
if (!(yield* fs.exists(generated))) return [];
|
|
124
140
|
return yield* Effect.filter((yield* fs.readDirectory(generated)).filter((file) => file.endsWith(".ts")), (file) => fs.readFileString(path.join(generated, file)).pipe(Effect.map((contents) => contents.startsWith(PREFIX))));
|
|
125
141
|
});
|
|
126
|
-
|
|
127
|
-
* The `confect/` files the generating sections matched and the `confect/` files
|
|
128
|
-
* those import, as recorded by the last codegen run that loaded them.
|
|
129
|
-
*/
|
|
130
|
-
const inputs = Effect.gen(function* () {
|
|
142
|
+
const record = Effect.fnUntraced(function* (name) {
|
|
131
143
|
const fs = yield* FileSystem.FileSystem;
|
|
132
|
-
const
|
|
144
|
+
const file = (yield* Path.Path).join(yield* ConfectDirectory.get, "_generated", name);
|
|
133
145
|
const none = [];
|
|
134
|
-
if (!(yield* fs.exists(
|
|
135
|
-
return Option.getOrElse(decodeSources(yield* fs.readFileString(
|
|
146
|
+
if (!(yield* fs.exists(file))) return none;
|
|
147
|
+
return Option.getOrElse(decodeSources(yield* fs.readFileString(file)), () => none);
|
|
136
148
|
});
|
|
137
149
|
/**
|
|
138
|
-
*
|
|
139
|
-
*
|
|
140
|
-
*
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
*
|
|
150
|
+
* The `confect/` files the declared sections' `generate` and `verify` matched
|
|
151
|
+
* and the `confect/` files those import, as recorded by the last codegen run
|
|
152
|
+
* that loaded them.
|
|
153
|
+
*/
|
|
154
|
+
const inputs = Effect.map(Effect.all([record(INPUTS), record(VERIFY_INPUTS)]), ([rendered, verified]) => [.../* @__PURE__ */ new Set([...rendered, ...verified])].sort());
|
|
155
|
+
/**
|
|
156
|
+
* Write each claimed file into `confect/_generated` once every section the
|
|
157
|
+
* declared backend names has rendered for its target; an undeclared backend
|
|
158
|
+
* renders none. Every section renders before codegen fails with the first error
|
|
159
|
+
* after logging the rest. The record of section inputs is written either way,
|
|
160
|
+
* keeping the previous inputs after a failure, so `confect dev` sees the fix.
|
|
161
|
+
* Returns the claimed file names, whether they differ from the section files
|
|
162
|
+
* that existed before, and the modules each section key matched.
|
|
145
163
|
*/
|
|
146
|
-
const sync = Effect.fnUntraced(function* (
|
|
164
|
+
const sync = Effect.fnUntraced(function* (backend, leaves, mounts) {
|
|
147
165
|
const path = yield* Path.Path;
|
|
148
166
|
const generated = path.join(yield* ConfectDirectory.get, "_generated");
|
|
149
|
-
const claimed = Option.isSome(
|
|
167
|
+
const claimed = Option.isSome(backend) ? (yield* Effect.fromResult(claims(backend.value.sections))).map((claim) => ({
|
|
150
168
|
claim,
|
|
151
|
-
target:
|
|
169
|
+
target: backend.value.target
|
|
152
170
|
})) : [];
|
|
153
171
|
const functions = [];
|
|
154
172
|
visit(leaves, (_, functionPath, source) => functions.push({
|
|
@@ -165,7 +183,7 @@ const sync = Effect.fnUntraced(function* (declared, leaves, mounts) {
|
|
|
165
183
|
...claim,
|
|
166
184
|
...output
|
|
167
185
|
}))));
|
|
168
|
-
if (failures.length > 0) for (const file of yield*
|
|
186
|
+
if (failures.length > 0) for (const file of yield* record(INPUTS)) watched.add(file);
|
|
169
187
|
yield* claimed.length === 0 ? removePathIfExists(path.join(generated, INPUTS)) : writeFileStringAndLog(path.join(generated, INPUTS), encodeSources([...watched].sort()));
|
|
170
188
|
const [error, ...more] = failures;
|
|
171
189
|
for (const other of more) yield* logCodegenError(other);
|
|
@@ -180,6 +198,54 @@ const sync = Effect.fnUntraced(function* (declared, leaves, mounts) {
|
|
|
180
198
|
};
|
|
181
199
|
});
|
|
182
200
|
/**
|
|
201
|
+
* Run each declared section's `verify` once every `_generated` file exists:
|
|
202
|
+
* bundle the `confect/` files its `match` selects as codegen bundles a
|
|
203
|
+
* declaration, and hand their exports, the mounts and the target to its
|
|
204
|
+
* `check`. Every section checks before codegen fails with the first refusal
|
|
205
|
+
* after logging the rest. The files each loaded are recorded as section inputs,
|
|
206
|
+
* keeping the previous ones after a failure, so `confect dev` checks again when
|
|
207
|
+
* one changes.
|
|
208
|
+
*/
|
|
209
|
+
const verify = Effect.fnUntraced(function* (backend, mounts) {
|
|
210
|
+
const path = yield* Path.Path;
|
|
211
|
+
const recorded = path.join(yield* ConfectDirectory.get, "_generated", VERIFY_INPUTS);
|
|
212
|
+
const checks = Option.match(backend, {
|
|
213
|
+
onNone: () => [],
|
|
214
|
+
onSome: ({ sections }) => sections.flatMap(({ key, section }) => section.generate?.verify === void 0 ? [] : [{
|
|
215
|
+
key,
|
|
216
|
+
verifier: section.generate.verify
|
|
217
|
+
}])
|
|
218
|
+
});
|
|
219
|
+
if (Option.isNone(backend) || checks.length === 0) return yield* removePathIfExists(recorded);
|
|
220
|
+
const { target } = backend.value;
|
|
221
|
+
const files = yield* sourceFiles;
|
|
222
|
+
const watched = /* @__PURE__ */ new Set();
|
|
223
|
+
const [, failures] = yield* Effect.partition(checks, ({ key, verifier }) => Effect.gen(function* () {
|
|
224
|
+
const failed = (cause) => new InvalidManifestSectionError({
|
|
225
|
+
sectionKey: key,
|
|
226
|
+
reason: `verify failed: ${String(cause)}`
|
|
227
|
+
});
|
|
228
|
+
const matched = yield* Effect.try({
|
|
229
|
+
try: () => files.filter((file) => verifier.match(file)),
|
|
230
|
+
catch: failed
|
|
231
|
+
});
|
|
232
|
+
const modules = yield* load(matched, watched, [componentConfigPlugin(path)]);
|
|
233
|
+
yield* refuse(key, yield* Effect.try({
|
|
234
|
+
try: () => verifier.check({
|
|
235
|
+
modules,
|
|
236
|
+
mounts,
|
|
237
|
+
target
|
|
238
|
+
}),
|
|
239
|
+
catch: failed
|
|
240
|
+
}));
|
|
241
|
+
}));
|
|
242
|
+
if (failures.length > 0) for (const file of yield* record(VERIFY_INPUTS)) watched.add(file);
|
|
243
|
+
yield* writeFileStringAndLog(recorded, encodeSources([...watched].sort()));
|
|
244
|
+
const [error, ...more] = failures;
|
|
245
|
+
for (const other of more) yield* logCodegenError(other);
|
|
246
|
+
if (error !== void 0) return yield* error;
|
|
247
|
+
});
|
|
248
|
+
/**
|
|
183
249
|
* Remove each file a section wrote that is not in `files`. Codegen runs this
|
|
184
250
|
* after it rewrites the registration files and the HTTP router, so a run that
|
|
185
251
|
* fails earlier leaves no import of a removed file.
|
|
@@ -193,6 +259,6 @@ const removeUnclaimed = Effect.fnUntraced(function* (files) {
|
|
|
193
259
|
}
|
|
194
260
|
});
|
|
195
261
|
//#endregion
|
|
196
|
-
export { builtIn, claims, inputs, removeUnclaimed, sync, written };
|
|
262
|
+
export { builtIn, claims, inputs, removeUnclaimed, sync, verify, written };
|
|
197
263
|
|
|
198
264
|
//# sourceMappingURL=SectionFiles.mjs.map
|