@gaganref/confect-cli 10.3.1-fork.53 → 10.3.1-fork.55
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/FunctionModule.mjs +17 -12
- package/dist/FunctionModule.mjs.map +1 -1
- package/dist/SectionFiles.mjs +70 -19
- package/dist/SectionFiles.mjs.map +1 -1
- package/dist/Watcher.mjs +3 -1
- package/dist/Watcher.mjs.map +1 -1
- package/dist/confect/codegen.mjs +29 -21
- package/dist/confect/codegen.mjs.map +1 -1
- package/dist/confect/declaration.mjs +4 -3
- package/dist/confect/declaration.mjs.map +1 -1
- package/dist/templates.mjs +7 -4
- package/dist/templates.mjs.map +1 -1
- package/package.json +3 -3
package/dist/FunctionModule.mjs
CHANGED
|
@@ -8,6 +8,7 @@ import { CodeBlockWriter } from "./CodeBlockWriter.mjs";
|
|
|
8
8
|
import { crons, declaredHttp, http } from "./templates.mjs";
|
|
9
9
|
import { removePathIfExists, toModuleImportPath, toPosixPath } from "./utils.mjs";
|
|
10
10
|
import { GroupPaths } from "./GroupPaths.mjs";
|
|
11
|
+
import { written } from "./SectionFiles.mjs";
|
|
11
12
|
import { functionPaths, plan } from "./GenerationSnapshot.mjs";
|
|
12
13
|
import * as Effect from "effect/Effect";
|
|
13
14
|
import * as FileSystem from "effect/FileSystem";
|
|
@@ -16,6 +17,7 @@ import * as Array from "effect/Array";
|
|
|
16
17
|
import { pipe } from "effect/Function";
|
|
17
18
|
import * as HashSet from "effect/HashSet";
|
|
18
19
|
import * as Match from "effect/Match";
|
|
20
|
+
import * as Schema from "effect/Schema";
|
|
19
21
|
//#region src/FunctionModule.ts
|
|
20
22
|
const RESERVED_CONVEX_TS_FILE_NAMES = /* @__PURE__ */ new Set([
|
|
21
23
|
"schema.ts",
|
|
@@ -50,6 +52,7 @@ const tokenize = (source, modulePath, path) => {
|
|
|
50
52
|
}
|
|
51
53
|
return tokens;
|
|
52
54
|
};
|
|
55
|
+
const encodeString = Schema.encodeSync(Schema.fromJsonString(Schema.String));
|
|
53
56
|
const matchesShape = (actual, expected) => {
|
|
54
57
|
let index = 0;
|
|
55
58
|
for (const token of expected) {
|
|
@@ -78,12 +81,14 @@ const assertOwnedEntrypoints = Effect.gen(function* () {
|
|
|
78
81
|
runtimeImportPath: yield* importFromConvex("runtime.ts")
|
|
79
82
|
})
|
|
80
83
|
]], ["crons.ts", [yield* crons({ cronsImportPath: yield* importFromConvex("crons.ts") })]]]);
|
|
84
|
+
const sectionImports = new Set((yield* written).map((file) => encodeString(path.join(confect, "_generated", path.basename(file, ".ts")))));
|
|
85
|
+
const withoutSectionImports = (tokens) => tokens[0] === "import" && sectionImports.has(tokens[1] ?? "") ? withoutSectionImports(tokens.slice(tokens[2] === ";" ? 3 : 2)) : tokens;
|
|
81
86
|
const refused = [];
|
|
82
87
|
for (const relative of yield* getEntrypoints) {
|
|
83
88
|
const absolute = path.join(convex, relative);
|
|
84
89
|
const tokens = tokenize(yield* fs.readFileString(absolute), absolute, path);
|
|
85
90
|
if (tokens !== void 0) {
|
|
86
|
-
if (optional.get(relative)?.some((template) => matchesShape(tokens, tokenize(template, absolute, path)))) continue;
|
|
91
|
+
if (optional.get(relative)?.some((template) => matchesShape(relative === "http.ts" ? withoutSectionImports(tokens) : tokens, tokenize(template, absolute, path)))) continue;
|
|
87
92
|
if (path.extname(relative) === ".ts") {
|
|
88
93
|
const names = tokens.flatMap((token, index) => token === "export" && tokens[index + 1] === "const" ? [tokens[index + 2]] : []);
|
|
89
94
|
const group = yield* fromGroupModulePath(relative);
|
|
@@ -126,20 +131,20 @@ const generateGroupModuleEffect = Effect.fnUntraced(function* ({ groupPath, func
|
|
|
126
131
|
const path = yield* Path.Path;
|
|
127
132
|
const convexDirectory = yield* ConvexDirectory.get;
|
|
128
133
|
const relativeModulePath = yield* modulePath(groupPath);
|
|
129
|
-
const modulePath$
|
|
130
|
-
const directoryPath = path.dirname(modulePath$
|
|
134
|
+
const modulePath$3 = path.join(convexDirectory, relativeModulePath);
|
|
135
|
+
const directoryPath = path.dirname(modulePath$3);
|
|
131
136
|
if (!(yield* fs.exists(directoryPath))) yield* fs.makeDirectory(directoryPath, { recursive: true });
|
|
132
137
|
const functionsContentsString = yield* render({
|
|
133
138
|
functionNames,
|
|
134
139
|
registeredFunctionsImportPath,
|
|
135
140
|
useNode
|
|
136
141
|
});
|
|
137
|
-
if (!(yield* fs.exists(modulePath$
|
|
138
|
-
yield* fs.writeFileString(modulePath$
|
|
142
|
+
if (!(yield* fs.exists(modulePath$3))) {
|
|
143
|
+
yield* fs.writeFileString(modulePath$3, functionsContentsString);
|
|
139
144
|
return "Added";
|
|
140
145
|
}
|
|
141
|
-
if ((yield* fs.readFileString(modulePath$
|
|
142
|
-
yield* fs.writeFileString(modulePath$
|
|
146
|
+
if ((yield* fs.readFileString(modulePath$3)) !== functionsContentsString) {
|
|
147
|
+
yield* fs.writeFileString(modulePath$3, functionsContentsString);
|
|
143
148
|
return "Modified";
|
|
144
149
|
}
|
|
145
150
|
return "Unchanged";
|
|
@@ -187,9 +192,9 @@ const removeGroups = Effect.fnUntraced(function* (groupPaths) {
|
|
|
187
192
|
const convexDirectory = yield* ConvexDirectory.get;
|
|
188
193
|
yield* Effect.all(HashSet.map(groupPaths, (groupPath) => Effect.gen(function* () {
|
|
189
194
|
const relativeModulePath = yield* modulePath(groupPath);
|
|
190
|
-
const modulePath$
|
|
195
|
+
const modulePath$2 = path.join(convexDirectory, relativeModulePath);
|
|
191
196
|
yield* Effect.logDebug(`Removing group '${relativeModulePath}'...`);
|
|
192
|
-
yield* removePathIfExists(modulePath$
|
|
197
|
+
yield* removePathIfExists(modulePath$2);
|
|
193
198
|
yield* Effect.logDebug(`Group '${relativeModulePath}' removed`);
|
|
194
199
|
})), { concurrency: "unbounded" });
|
|
195
200
|
});
|
|
@@ -197,15 +202,15 @@ const writeGroups = (groups) => Effect.forEach(groups, Effect.fnUntraced(functio
|
|
|
197
202
|
const path = yield* Path.Path;
|
|
198
203
|
const convexDirectory = yield* ConvexDirectory.get;
|
|
199
204
|
const relativeModulePath = yield* modulePath(group.path);
|
|
200
|
-
const modulePath$
|
|
201
|
-
const registeredFunctionsImportPath = yield* registeredFunctionsImportPathForGroup(group.path, modulePath$
|
|
205
|
+
const modulePath$1 = path.join(convexDirectory, relativeModulePath);
|
|
206
|
+
const registeredFunctionsImportPath = yield* registeredFunctionsImportPathForGroup(group.path, modulePath$1);
|
|
202
207
|
const change = yield* generateGroupModule({
|
|
203
208
|
groupPath: group.path,
|
|
204
209
|
functionNames: group.functionNames,
|
|
205
210
|
registeredFunctionsImportPath,
|
|
206
211
|
useNode: group.runtime === "Node"
|
|
207
212
|
});
|
|
208
|
-
yield* Match.value(change).pipe(Match.when("Added", () => logFileAdded(modulePath$
|
|
213
|
+
yield* Match.value(change).pipe(Match.when("Added", () => logFileAdded(modulePath$1)), Match.when("Modified", () => logFileModified(modulePath$1)), Match.when("Unchanged", () => Effect.void), Match.exhaustive);
|
|
209
214
|
}));
|
|
210
215
|
//#endregion
|
|
211
216
|
export { applyFunctionPlan, assertOwnedEntrypoints, generateFunctions, generateGroupModule, registeredFunctionsImportPathForGroup, removeGroups, render, writeGroups };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FunctionModule.mjs","names":["templates.http","templates.declaredHttp","templates.crons","GroupPath.fromGroupModulePath","GroupPath.modulePath","modulePath","GenerationSnapshot.plan","GenerationSnapshot.functionPaths"],"sources":["../src/FunctionModule.ts"],"sourcesContent":["import * as FileSystem from \"effect/FileSystem\";\nimport * as Path from \"effect/Path\";\nimport { pipe } from \"effect/Function\";\nimport * as Array from \"effect/Array\";\nimport * as Effect from \"effect/Effect\";\nimport * as HashSet from \"effect/HashSet\";\nimport * as Match from \"effect/Match\";\nimport { UnownedConvexEntrypointError } from \"./CodegenError.js\";\nimport * as templates from \"./templates.js\";\nimport * as GenerationSnapshot from \"./GenerationSnapshot.js\";\nimport * as GroupPath from \"./GroupPath.js\";\nimport * as GroupPaths from \"./GroupPaths.js\";\nimport { CodeBlockWriter } from \"./CodeBlockWriter.js\";\nimport { logFileAdded, logFileModified, logFileRemoved } from \"./log.js\";\nimport { ConfectDirectory } from \"./ConfectDirectory.js\";\nimport { ConvexDirectory } from \"./ConvexDirectory.js\";\nimport {\n removePathIfExists,\n toModuleImportPath,\n toPosixPath,\n} from \"./utils.js\";\nimport { ProjectRoot } from \"./ProjectRoot.js\";\n\nconst RESERVED_CONVEX_TS_FILE_NAMES = new Set([\n \"schema.ts\",\n \"http.ts\",\n \"crons.ts\",\n \"auth.config.ts\",\n \"convex.config.ts\",\n]);\n\n// Keep ownership and removal aligned with Convex's bundler entryPoints filter.\nconst getEntrypoints = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const convex = yield* ConvexDirectory.get;\n const files = yield* fs.readDirectory(convex, { recursive: true });\n const components = files\n .filter(\n (file) =>\n path.basename(file) === \"convex.config.ts\" &&\n path.dirname(file) !== \".\",\n )\n .map((file) => path.dirname(file) + path.sep);\n return files.filter((file) => {\n const base = path.basename(file);\n return (\n !file.startsWith(\"_generated\" + path.sep) &&\n !components.some((component) => file.startsWith(component)) &&\n /\\.(?:js|mjs|cjs|ts|tsx|mts|cts|jsx)$/.test(base) &&\n !base.startsWith(\".\") &&\n !base.startsWith(\"#\") &&\n (base.match(/\\./g)?.length ?? 0) === 1 &&\n base !== \"schema.ts\" &&\n base !== \"schema.js\" &&\n !file.includes(\" \")\n );\n });\n});\n\nconst tokenize = (\n source: string,\n modulePath: string,\n path: Path.Path,\n): string[] | undefined => {\n const token =\n /\\s+|\\/\\/[^\\r\\n]*|\\/\\*[\\s\\S]*?\\*\\/|\"(?:\\\\.|[^\"\\\\\\r\\n])*\"|'(?:\\\\.|[^'\\\\\\r\\n])*'|[$A-Z_a-z][$\\w]*|[{}()[\\].,:;=]/y;\n const tokens: string[] = [];\n while (token.lastIndex < source.length) {\n const match = token.exec(source);\n if (match === null) return undefined;\n const value = match[0];\n if (/^\\s|^\\//.test(value)) continue;\n if (value.startsWith('\"') || value.startsWith(\"'\")) {\n const literal = value.slice(1, -1);\n tokens.push(\n JSON.stringify(\n literal.startsWith(\".\")\n ? path.resolve(\n path.dirname(modulePath),\n literal.replace(/\\.js$/, \"\"),\n )\n : literal,\n ),\n );\n } else tokens.push(value);\n }\n return tokens;\n};\n\nconst matchesShape = (\n actual: readonly string[],\n expected: readonly string[],\n) => {\n let index = 0;\n for (const token of expected) {\n if (token === \";\" && actual[index] !== \";\") continue;\n if (actual[index] === \",\" && (token === \"}\" || token === \")\")) index++;\n if (actual[index++] !== token) return false;\n }\n return index === actual.length;\n};\n\nexport const assertOwnedEntrypoints = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const convex = yield* ConvexDirectory.get;\n const confect = yield* ConfectDirectory.get;\n const projectRoot = yield* ProjectRoot.get;\n const importFromConvex = (file: string) =>\n toModuleImportPath(path.relative(convex, path.join(confect, file)));\n const optional = new Map([\n [\n \"http.ts\",\n [\n yield* templates.http({\n httpImportPath: yield* importFromConvex(\"http.ts\"),\n }),\n yield* templates.declaredHttp({\n schemaImportPath: yield* importFromConvex(\"_generated/schema.ts\"),\n httpImportPath: yield* importFromConvex(\"http.ts\"),\n }),\n yield* templates.declaredHttp({\n schemaImportPath: yield* importFromConvex(\"_generated/schema.ts\"),\n httpImportPath: yield* importFromConvex(\"http.ts\"),\n runtimeImportPath: yield* importFromConvex(\"runtime.ts\"),\n }),\n ],\n ],\n [\n \"crons.ts\",\n [\n yield* templates.crons({\n cronsImportPath: yield* importFromConvex(\"crons.ts\"),\n }),\n ],\n ],\n ]);\n const refused: string[] = [];\n for (const relative of yield* getEntrypoints) {\n const absolute = path.join(convex, relative);\n const tokens = tokenize(yield* fs.readFileString(absolute), absolute, path);\n if (tokens !== undefined) {\n if (\n optional\n .get(relative)\n ?.some((template) =>\n matchesShape(tokens, tokenize(template, absolute, path)!),\n )\n )\n continue;\n if (path.extname(relative) === \".ts\") {\n const names = tokens.flatMap((token, index) =>\n token === \"export\" && tokens[index + 1] === \"const\"\n ? [tokens[index + 2]!]\n : [],\n );\n const group = yield* GroupPath.fromGroupModulePath(relative);\n const template = yield* render({\n functionNames: names,\n registeredFunctionsImportPath:\n yield* registeredFunctionsImportPathForGroup(group, absolute),\n useNode: tokens[0] === '\"use node\"',\n });\n if (\n names.length > 0 &&\n new Set(names).size === names.length &&\n matchesShape(tokens, tokenize(template, absolute, path)!)\n )\n continue;\n }\n }\n refused.push(toPosixPath(path, path.relative(projectRoot, absolute)));\n }\n if (refused.length > 0)\n return yield* new UnownedConvexEntrypointError({\n filePaths: refused.sort(),\n });\n});\n\nexport const render = ({\n functionNames,\n registeredFunctionsImportPath,\n useNode = false,\n}: Parameters<typeof renderEffect>[0]) =>\n renderEffect({ functionNames, registeredFunctionsImportPath, useNode });\n\nconst renderEffect = Effect.fnUntraced(function* ({\n functionNames,\n registeredFunctionsImportPath,\n useNode = false,\n}: {\n functionNames: ReadonlyArray<string>;\n registeredFunctionsImportPath: string;\n useNode?: boolean;\n}) {\n const cbw = new CodeBlockWriter({ indentNumberOfSpaces: 2 });\n\n if (useNode) {\n yield* cbw.writeLine(`\"use node\";`);\n yield* cbw.blankLine();\n }\n\n yield* cbw.writeLine(\n `import registeredFunctions from \"${registeredFunctionsImportPath}\";`,\n );\n yield* cbw.newLine();\n yield* Effect.forEach(functionNames, (name) =>\n cbw.writeLine(`export const ${name} = registeredFunctions.${name};`),\n );\n\n return yield* cbw.toString();\n});\n\nexport const generateGroupModule = ({\n groupPath,\n functionNames,\n registeredFunctionsImportPath,\n useNode = false,\n}: Parameters<typeof generateGroupModuleEffect>[0]) =>\n generateGroupModuleEffect({\n groupPath,\n functionNames,\n registeredFunctionsImportPath,\n useNode,\n });\n\nconst generateGroupModuleEffect = Effect.fnUntraced(function* ({\n groupPath,\n functionNames,\n registeredFunctionsImportPath,\n useNode = false,\n}: {\n groupPath: GroupPath.GroupPath;\n functionNames: ReadonlyArray<string>;\n registeredFunctionsImportPath: string;\n useNode?: boolean;\n}) {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const convexDirectory = yield* ConvexDirectory.get;\n\n const relativeModulePath = yield* GroupPath.modulePath(groupPath);\n const modulePath = path.join(convexDirectory, relativeModulePath);\n\n const directoryPath = path.dirname(modulePath);\n if (!(yield* fs.exists(directoryPath))) {\n yield* fs.makeDirectory(directoryPath, { recursive: true });\n }\n\n const functionsContentsString = yield* render({\n functionNames,\n registeredFunctionsImportPath,\n useNode,\n });\n\n if (!(yield* fs.exists(modulePath))) {\n yield* fs.writeFileString(modulePath, functionsContentsString);\n return \"Added\" as const;\n }\n const existing = yield* fs.readFileString(modulePath);\n if (existing !== functionsContentsString) {\n yield* fs.writeFileString(modulePath, functionsContentsString);\n return \"Modified\" as const;\n }\n return \"Unchanged\" as const;\n});\n\n/**\n * Compute the module import specifier (relative to `modulePath`) for a group's\n * registry file under `confect/_generated/registeredFunctions/`. The registry\n * path mirrors the group's path one-to-one (see\n * `registeredFunctionsRelativePath` in `LeafModule.ts`) for both Convex and\n * Node groups.\n */\nexport const registeredFunctionsImportPathForGroup = Effect.fnUntraced(\n function* (groupPath: GroupPath.GroupPath, modulePath: string) {\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n\n const registeredFunctionsPath =\n path.join(\n confectDirectory,\n \"_generated\",\n \"registeredFunctions\",\n ...groupPath.pathSegments,\n ) + \".ts\";\n\n return yield* toModuleImportPath(\n path.relative(path.dirname(modulePath), registeredFunctionsPath),\n );\n },\n);\n\nconst logGroupPaths = Effect.fnUntraced(function* <R>(\n groupPaths: GroupPaths.GroupPaths,\n logFn: (fullPath: string) => Effect.Effect<void, never, R>,\n): Effect.fn.Return<void, never, R | Path.Path | ConvexDirectory> {\n const path = yield* Path.Path;\n const convexDirectory = yield* ConvexDirectory.get;\n\n yield* Effect.forEach(\n groupPaths,\n Effect.fnUntraced(function* (gp: GroupPath.GroupPath) {\n const relativeModulePath = yield* GroupPath.modulePath(gp);\n yield* logFn(path.join(convexDirectory, relativeModulePath));\n }),\n );\n});\n\nexport const generateFunctions = Effect.fnUntraced(function* (\n snapshot: GenerationSnapshot.GenerationSnapshot,\n) {\n const groupPathsFromFs = yield* getGroupPathsFromFs;\n yield* applyFunctionPlan(GenerationSnapshot.plan(snapshot, groupPathsFromFs));\n return GenerationSnapshot.functionPaths(snapshot);\n});\n\nexport const applyFunctionPlan = Effect.fnUntraced(function* (\n plan: GenerationSnapshot.ModulePlan,\n) {\n const removed = GroupPaths.GroupPaths.make(\n HashSet.fromIterable(plan.removed),\n );\n yield* removeGroups(removed);\n yield* logGroupPaths(removed, logFileRemoved);\n yield* writeGroups(plan.changed);\n});\n\nconst getGroupPathsFromFs = Effect.gen(function* () {\n const path = yield* Path.Path;\n const allConvexPaths = yield* getEntrypoints;\n const groupPathArray = yield* pipe(\n allConvexPaths,\n Array.filter(\n (convexPath) =>\n path.extname(convexPath) === \".ts\" &&\n !RESERVED_CONVEX_TS_FILE_NAMES.has(path.basename(convexPath)),\n ),\n Effect.forEach((groupModulePath) =>\n GroupPath.fromGroupModulePath(groupModulePath),\n ),\n );\n return GroupPaths.GroupPaths.make(HashSet.fromIterable(groupPathArray));\n});\n\nexport const removeGroups = Effect.fnUntraced(function* (\n groupPaths: GroupPaths.GroupPaths,\n) {\n const path = yield* Path.Path;\n const convexDirectory = yield* ConvexDirectory.get;\n\n yield* Effect.all(\n HashSet.map(groupPaths, (groupPath) =>\n Effect.gen(function* () {\n const relativeModulePath = yield* GroupPath.modulePath(groupPath);\n const modulePath = path.join(convexDirectory, relativeModulePath);\n\n yield* Effect.logDebug(`Removing group '${relativeModulePath}'...`);\n\n yield* removePathIfExists(modulePath);\n yield* Effect.logDebug(`Group '${relativeModulePath}' removed`);\n }),\n ),\n { concurrency: \"unbounded\" },\n );\n});\n\nexport const writeGroups = (\n groups: ReadonlyArray<GenerationSnapshot.GroupSummary>,\n) =>\n Effect.forEach(\n groups,\n Effect.fnUntraced(function* (group: GenerationSnapshot.GroupSummary) {\n const path = yield* Path.Path;\n const convexDirectory = yield* ConvexDirectory.get;\n const relativeModulePath = yield* GroupPath.modulePath(group.path);\n const modulePath = path.join(convexDirectory, relativeModulePath);\n const registeredFunctionsImportPath =\n yield* registeredFunctionsImportPathForGroup(group.path, modulePath);\n const change = yield* generateGroupModule({\n groupPath: group.path,\n functionNames: group.functionNames,\n registeredFunctionsImportPath,\n useNode: group.runtime === \"Node\",\n });\n yield* Match.value(change).pipe(\n Match.when(\"Added\", () => logFileAdded(modulePath)),\n Match.when(\"Modified\", () => logFileModified(modulePath)),\n Match.when(\"Unchanged\", () => Effect.void),\n Match.exhaustive,\n );\n }),\n );\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAuBA,MAAM,gDAAgC,IAAI,IAAI;CAC5C;CACA;CACA;CACA;CACA;AACF,CAAC;AAGD,MAAM,iBAAiB,OAAO,IAAI,aAAa;CAC7C,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,SAAS,OAAO,gBAAgB;CACtC,MAAM,QAAQ,OAAO,GAAG,cAAc,QAAQ,EAAE,WAAW,KAAK,CAAC;CACjE,MAAM,aAAa,MAChB,QACE,SACC,KAAK,SAAS,IAAI,MAAM,sBACxB,KAAK,QAAQ,IAAI,MAAM,GAC3B,CAAC,CACA,KAAK,SAAS,KAAK,QAAQ,IAAI,IAAI,KAAK,GAAG;CAC9C,OAAO,MAAM,QAAQ,SAAS;EAC5B,MAAM,OAAO,KAAK,SAAS,IAAI;EAC/B,OACE,CAAC,KAAK,WAAW,eAAe,KAAK,GAAG,KACxC,CAAC,WAAW,MAAM,cAAc,KAAK,WAAW,SAAS,CAAC,KAC1D,uCAAuC,KAAK,IAAI,KAChD,CAAC,KAAK,WAAW,GAAG,KACpB,CAAC,KAAK,WAAW,GAAG,MACnB,KAAK,MAAM,KAAK,CAAC,EAAE,UAAU,OAAO,KACrC,SAAS,eACT,SAAS,eACT,CAAC,KAAK,SAAS,GAAG;CAEtB,CAAC;AACH,CAAC;AAED,MAAM,YACJ,QACA,YACA,SACyB;CACzB,MAAM,QACJ;CACF,MAAM,SAAmB,CAAC;CAC1B,OAAO,MAAM,YAAY,OAAO,QAAQ;EACtC,MAAM,QAAQ,MAAM,KAAK,MAAM;EAC/B,IAAI,UAAU,MAAM,OAAO,KAAA;EAC3B,MAAM,QAAQ,MAAM;EACpB,IAAI,UAAU,KAAK,KAAK,GAAG;EAC3B,IAAI,MAAM,WAAW,IAAG,KAAK,MAAM,WAAW,GAAG,GAAG;GAClD,MAAM,UAAU,MAAM,MAAM,GAAG,EAAE;GACjC,OAAO,KACL,KAAK,UACH,QAAQ,WAAW,GAAG,IAClB,KAAK,QACH,KAAK,QAAQ,UAAU,GACvB,QAAQ,QAAQ,SAAS,EAAE,CAC7B,IACA,OACN,CACF;EACF,OAAO,OAAO,KAAK,KAAK;CAC1B;CACA,OAAO;AACT;AAEA,MAAM,gBACJ,QACA,aACG;CACH,IAAI,QAAQ;CACZ,KAAK,MAAM,SAAS,UAAU;EAC5B,IAAI,UAAU,OAAO,OAAO,WAAW,KAAK;EAC5C,IAAI,OAAO,WAAW,QAAQ,UAAU,OAAO,UAAU,MAAM;EAC/D,IAAI,OAAO,aAAa,OAAO,OAAO;CACxC;CACA,OAAO,UAAU,OAAO;AAC1B;AAEA,MAAa,yBAAyB,OAAO,IAAI,aAAa;CAC5D,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,SAAS,OAAO,gBAAgB;CACtC,MAAM,UAAU,OAAO,iBAAiB;CACxC,MAAM,cAAc,OAAO,YAAY;CACvC,MAAM,oBAAoB,SACxB,mBAAmB,KAAK,SAAS,QAAQ,KAAK,KAAK,SAAS,IAAI,CAAC,CAAC;CACpE,MAAM,2BAAW,IAAI,IAAI,CACvB,CACE,WACA;EACE,OAAOA,KAAe,EACpB,gBAAgB,OAAO,iBAAiB,SAAS,EACnD,CAAC;EACD,OAAOC,aAAuB;GAC5B,kBAAkB,OAAO,iBAAiB,sBAAsB;GAChE,gBAAgB,OAAO,iBAAiB,SAAS;EACnD,CAAC;EACD,OAAOA,aAAuB;GAC5B,kBAAkB,OAAO,iBAAiB,sBAAsB;GAChE,gBAAgB,OAAO,iBAAiB,SAAS;GACjD,mBAAmB,OAAO,iBAAiB,YAAY;EACzD,CAAC;CACH,CACF,GACA,CACE,YACA,CACE,OAAOC,MAAgB,EACrB,iBAAiB,OAAO,iBAAiB,UAAU,EACrD,CAAC,CACH,CACF,CACF,CAAC;CACD,MAAM,UAAoB,CAAC;CAC3B,KAAK,MAAM,YAAY,OAAO,gBAAgB;EAC5C,MAAM,WAAW,KAAK,KAAK,QAAQ,QAAQ;EAC3C,MAAM,SAAS,SAAS,OAAO,GAAG,eAAe,QAAQ,GAAG,UAAU,IAAI;EAC1E,IAAI,WAAW,KAAA,GAAW;GACxB,IACE,SACG,IAAI,QAAQ,CAAC,EACZ,MAAM,aACN,aAAa,QAAQ,SAAS,UAAU,UAAU,IAAI,CAAE,CAC1D,GAEF;GACF,IAAI,KAAK,QAAQ,QAAQ,MAAM,OAAO;IACpC,MAAM,QAAQ,OAAO,SAAS,OAAO,UACnC,UAAU,YAAY,OAAO,QAAQ,OAAO,UACxC,CAAC,OAAO,QAAQ,EAAG,IACnB,CAAC,CACP;IACA,MAAM,QAAQ,OAAOC,oBAA8B,QAAQ;IAC3D,MAAM,WAAW,OAAO,OAAO;KAC7B,eAAe;KACf,+BACE,OAAO,sCAAsC,OAAO,QAAQ;KAC9D,SAAS,OAAO,OAAO;IACzB,CAAC;IACD,IACE,MAAM,SAAS,KACf,IAAI,IAAI,KAAK,CAAC,CAAC,SAAS,MAAM,UAC9B,aAAa,QAAQ,SAAS,UAAU,UAAU,IAAI,CAAE,GAExD;GACJ;EACF;EACA,QAAQ,KAAK,YAAY,MAAM,KAAK,SAAS,aAAa,QAAQ,CAAC,CAAC;CACtE;CACA,IAAI,QAAQ,SAAS,GACnB,OAAO,OAAO,IAAI,6BAA6B,EAC7C,WAAW,QAAQ,KAAK,EAC1B,CAAC;AACL,CAAC;AAED,MAAa,UAAU,EACrB,eACA,+BACA,UAAU,YAEV,aAAa;CAAE;CAAe;CAA+B;AAAQ,CAAC;AAExE,MAAM,eAAe,OAAO,WAAW,WAAW,EAChD,eACA,+BACA,UAAU,SAKT;CACD,MAAM,MAAM,IAAI,gBAAgB,EAAE,sBAAsB,EAAE,CAAC;CAE3D,IAAI,SAAS;EACX,OAAO,IAAI,UAAU,aAAa;EAClC,OAAO,IAAI,UAAU;CACvB;CAEA,OAAO,IAAI,UACT,oCAAoC,8BAA8B,GACpE;CACA,OAAO,IAAI,QAAQ;CACnB,OAAO,OAAO,QAAQ,gBAAgB,SACpC,IAAI,UAAU,gBAAgB,KAAK,yBAAyB,KAAK,EAAE,CACrE;CAEA,OAAO,OAAO,IAAI,SAAS;AAC7B,CAAC;AAED,MAAa,uBAAuB,EAClC,WACA,eACA,+BACA,UAAU,YAEV,0BAA0B;CACxB;CACA;CACA;CACA;AACF,CAAC;AAEH,MAAM,4BAA4B,OAAO,WAAW,WAAW,EAC7D,WACA,eACA,+BACA,UAAU,SAMT;CACD,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,kBAAkB,OAAO,gBAAgB;CAE/C,MAAM,qBAAqB,OAAOC,WAAqB,SAAS;CAChE,MAAMC,eAAa,KAAK,KAAK,iBAAiB,kBAAkB;CAEhE,MAAM,gBAAgB,KAAK,QAAQA,YAAU;CAC7C,IAAI,EAAE,OAAO,GAAG,OAAO,aAAa,IAClC,OAAO,GAAG,cAAc,eAAe,EAAE,WAAW,KAAK,CAAC;CAG5D,MAAM,0BAA0B,OAAO,OAAO;EAC5C;EACA;EACA;CACF,CAAC;CAED,IAAI,EAAE,OAAO,GAAG,OAAOA,YAAU,IAAI;EACnC,OAAO,GAAG,gBAAgBA,cAAY,uBAAuB;EAC7D,OAAO;CACT;CAEA,KAAI,OADoB,GAAG,eAAeA,YAAU,OACnC,yBAAyB;EACxC,OAAO,GAAG,gBAAgBA,cAAY,uBAAuB;EAC7D,OAAO;CACT;CACA,OAAO;AACT,CAAC;;;;;;;;AASD,MAAa,wCAAwC,OAAO,WAC1D,WAAW,WAAgC,YAAoB;CAC7D,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,mBAAmB,OAAO,iBAAiB;CAEjD,MAAM,0BACJ,KAAK,KACH,kBACA,cACA,uBACA,GAAG,UAAU,YACf,IAAI;CAEN,OAAO,OAAO,mBACZ,KAAK,SAAS,KAAK,QAAQ,UAAU,GAAG,uBAAuB,CACjE;AACF,CACF;AAEA,MAAM,gBAAgB,OAAO,WAAW,WACtC,YACA,OACgE;CAChE,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,kBAAkB,OAAO,gBAAgB;CAE/C,OAAO,OAAO,QACZ,YACA,OAAO,WAAW,WAAW,IAAyB;EACpD,MAAM,qBAAqB,OAAOD,WAAqB,EAAE;EACzD,OAAO,MAAM,KAAK,KAAK,iBAAiB,kBAAkB,CAAC;CAC7D,CAAC,CACH;AACF,CAAC;AAED,MAAa,oBAAoB,OAAO,WAAW,WACjD,UACA;CACA,MAAM,mBAAmB,OAAO;CAChC,OAAO,kBAAkBE,KAAwB,UAAU,gBAAgB,CAAC;CAC5E,OAAOC,cAAiC,QAAQ;AAClD,CAAC;AAED,MAAa,oBAAoB,OAAO,WAAW,WACjD,MACA;CACA,MAAM,UAAA,WAAgC,KACpC,QAAQ,aAAa,KAAK,OAAO,CACnC;CACA,OAAO,aAAa,OAAO;CAC3B,OAAO,cAAc,SAAS,cAAc;CAC5C,OAAO,YAAY,KAAK,OAAO;AACjC,CAAC;AAED,MAAM,sBAAsB,OAAO,IAAI,aAAa;CAClD,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,iBAAiB,OAAO;CAC9B,MAAM,iBAAiB,OAAO,KAC5B,gBACA,MAAM,QACH,eACC,KAAK,QAAQ,UAAU,MAAM,SAC7B,CAAC,8BAA8B,IAAI,KAAK,SAAS,UAAU,CAAC,CAChE,GACA,OAAO,SAAS,oBACdJ,oBAA8B,eAAe,CAC/C,CACF;CACA,OAAA,WAA6B,KAAK,QAAQ,aAAa,cAAc,CAAC;AACxE,CAAC;AAED,MAAa,eAAe,OAAO,WAAW,WAC5C,YACA;CACA,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,kBAAkB,OAAO,gBAAgB;CAE/C,OAAO,OAAO,IACZ,QAAQ,IAAI,aAAa,cACvB,OAAO,IAAI,aAAa;EACtB,MAAM,qBAAqB,OAAOC,WAAqB,SAAS;EAChE,MAAMC,eAAa,KAAK,KAAK,iBAAiB,kBAAkB;EAEhE,OAAO,OAAO,SAAS,mBAAmB,mBAAmB,KAAK;EAElE,OAAO,mBAAmBA,YAAU;EACpC,OAAO,OAAO,SAAS,UAAU,mBAAmB,UAAU;CAChE,CAAC,CACH,GACA,EAAE,aAAa,YAAY,CAC7B;AACF,CAAC;AAED,MAAa,eACX,WAEA,OAAO,QACL,QACA,OAAO,WAAW,WAAW,OAAwC;CACnE,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,kBAAkB,OAAO,gBAAgB;CAC/C,MAAM,qBAAqB,OAAOD,WAAqB,MAAM,IAAI;CACjE,MAAMC,eAAa,KAAK,KAAK,iBAAiB,kBAAkB;CAChE,MAAM,gCACJ,OAAO,sCAAsC,MAAM,MAAMA,YAAU;CACrE,MAAM,SAAS,OAAO,oBAAoB;EACxC,WAAW,MAAM;EACjB,eAAe,MAAM;EACrB;EACA,SAAS,MAAM,YAAY;CAC7B,CAAC;CACD,OAAO,MAAM,MAAM,MAAM,CAAC,CAAC,KACzB,MAAM,KAAK,eAAe,aAAaA,YAAU,CAAC,GAClD,MAAM,KAAK,kBAAkB,gBAAgBA,YAAU,CAAC,GACxD,MAAM,KAAK,mBAAmB,OAAO,IAAI,GACzC,MAAM,UACR;AACF,CAAC,CACH"}
|
|
1
|
+
{"version":3,"file":"FunctionModule.mjs","names":["templates.http","templates.declaredHttp","templates.crons","SectionFiles.written","GroupPath.fromGroupModulePath","GroupPath.modulePath","modulePath","GenerationSnapshot.plan","GenerationSnapshot.functionPaths"],"sources":["../src/FunctionModule.ts"],"sourcesContent":["import * as FileSystem from \"effect/FileSystem\";\nimport * as Path from \"effect/Path\";\nimport { pipe } from \"effect/Function\";\nimport * as Array from \"effect/Array\";\nimport * as Effect from \"effect/Effect\";\nimport * as HashSet from \"effect/HashSet\";\nimport * as Match from \"effect/Match\";\nimport * as Schema from \"effect/Schema\";\nimport { UnownedConvexEntrypointError } from \"./CodegenError.js\";\nimport * as SectionFiles from \"./SectionFiles.js\";\nimport * as templates from \"./templates.js\";\nimport * as GenerationSnapshot from \"./GenerationSnapshot.js\";\nimport * as GroupPath from \"./GroupPath.js\";\nimport * as GroupPaths from \"./GroupPaths.js\";\nimport { CodeBlockWriter } from \"./CodeBlockWriter.js\";\nimport { logFileAdded, logFileModified, logFileRemoved } from \"./log.js\";\nimport { ConfectDirectory } from \"./ConfectDirectory.js\";\nimport { ConvexDirectory } from \"./ConvexDirectory.js\";\nimport {\n removePathIfExists,\n toModuleImportPath,\n toPosixPath,\n} from \"./utils.js\";\nimport { ProjectRoot } from \"./ProjectRoot.js\";\n\nconst RESERVED_CONVEX_TS_FILE_NAMES = new Set([\n \"schema.ts\",\n \"http.ts\",\n \"crons.ts\",\n \"auth.config.ts\",\n \"convex.config.ts\",\n]);\n\n// Keep ownership and removal aligned with Convex's bundler entryPoints filter.\nconst getEntrypoints = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const convex = yield* ConvexDirectory.get;\n const files = yield* fs.readDirectory(convex, { recursive: true });\n const components = files\n .filter(\n (file) =>\n path.basename(file) === \"convex.config.ts\" &&\n path.dirname(file) !== \".\",\n )\n .map((file) => path.dirname(file) + path.sep);\n return files.filter((file) => {\n const base = path.basename(file);\n return (\n !file.startsWith(\"_generated\" + path.sep) &&\n !components.some((component) => file.startsWith(component)) &&\n /\\.(?:js|mjs|cjs|ts|tsx|mts|cts|jsx)$/.test(base) &&\n !base.startsWith(\".\") &&\n !base.startsWith(\"#\") &&\n (base.match(/\\./g)?.length ?? 0) === 1 &&\n base !== \"schema.ts\" &&\n base !== \"schema.js\" &&\n !file.includes(\" \")\n );\n });\n});\n\nconst tokenize = (\n source: string,\n modulePath: string,\n path: Path.Path,\n): string[] | undefined => {\n const token =\n /\\s+|\\/\\/[^\\r\\n]*|\\/\\*[\\s\\S]*?\\*\\/|\"(?:\\\\.|[^\"\\\\\\r\\n])*\"|'(?:\\\\.|[^'\\\\\\r\\n])*'|[$A-Z_a-z][$\\w]*|[{}()[\\].,:;=]/y;\n const tokens: string[] = [];\n while (token.lastIndex < source.length) {\n const match = token.exec(source);\n if (match === null) return undefined;\n const value = match[0];\n if (/^\\s|^\\//.test(value)) continue;\n if (value.startsWith('\"') || value.startsWith(\"'\")) {\n const literal = value.slice(1, -1);\n tokens.push(\n JSON.stringify(\n literal.startsWith(\".\")\n ? path.resolve(\n path.dirname(modulePath),\n literal.replace(/\\.js$/, \"\"),\n )\n : literal,\n ),\n );\n } else tokens.push(value);\n }\n return tokens;\n};\n\nconst encodeString = Schema.encodeSync(Schema.fromJsonString(Schema.String));\n\nconst matchesShape = (\n actual: readonly string[],\n expected: readonly string[],\n) => {\n let index = 0;\n for (const token of expected) {\n if (token === \";\" && actual[index] !== \";\") continue;\n if (actual[index] === \",\" && (token === \"}\" || token === \")\")) index++;\n if (actual[index++] !== token) return false;\n }\n return index === actual.length;\n};\n\nexport const assertOwnedEntrypoints = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const convex = yield* ConvexDirectory.get;\n const confect = yield* ConfectDirectory.get;\n const projectRoot = yield* ProjectRoot.get;\n const importFromConvex = (file: string) =>\n toModuleImportPath(path.relative(convex, path.join(confect, file)));\n const optional = new Map([\n [\n \"http.ts\",\n [\n yield* templates.http({\n httpImportPath: yield* importFromConvex(\"http.ts\"),\n }),\n yield* templates.declaredHttp({\n schemaImportPath: yield* importFromConvex(\"_generated/schema.ts\"),\n httpImportPath: yield* importFromConvex(\"http.ts\"),\n }),\n yield* templates.declaredHttp({\n schemaImportPath: yield* importFromConvex(\"_generated/schema.ts\"),\n httpImportPath: yield* importFromConvex(\"http.ts\"),\n runtimeImportPath: yield* importFromConvex(\"runtime.ts\"),\n }),\n ],\n ],\n [\n \"crons.ts\",\n [\n yield* templates.crons({\n cronsImportPath: yield* importFromConvex(\"crons.ts\"),\n }),\n ],\n ],\n ]);\n // The declared HTTP router first imports each file a manifest section wrote.\n const sectionImports = new Set(\n (yield* SectionFiles.written).map((file) =>\n encodeString(\n path.join(confect, \"_generated\", path.basename(file, \".ts\")),\n ),\n ),\n );\n const withoutSectionImports = (\n tokens: ReadonlyArray<string>,\n ): ReadonlyArray<string> =>\n tokens[0] === \"import\" && sectionImports.has(tokens[1] ?? \"\")\n ? withoutSectionImports(tokens.slice(tokens[2] === \";\" ? 3 : 2))\n : tokens;\n const refused: string[] = [];\n for (const relative of yield* getEntrypoints) {\n const absolute = path.join(convex, relative);\n const tokens = tokenize(yield* fs.readFileString(absolute), absolute, path);\n if (tokens !== undefined) {\n if (\n optional\n .get(relative)\n ?.some((template) =>\n matchesShape(\n relative === \"http.ts\" ? withoutSectionImports(tokens) : tokens,\n tokenize(template, absolute, path)!,\n ),\n )\n )\n continue;\n if (path.extname(relative) === \".ts\") {\n const names = tokens.flatMap((token, index) =>\n token === \"export\" && tokens[index + 1] === \"const\"\n ? [tokens[index + 2]!]\n : [],\n );\n const group = yield* GroupPath.fromGroupModulePath(relative);\n const template = yield* render({\n functionNames: names,\n registeredFunctionsImportPath:\n yield* registeredFunctionsImportPathForGroup(group, absolute),\n useNode: tokens[0] === '\"use node\"',\n });\n if (\n names.length > 0 &&\n new Set(names).size === names.length &&\n matchesShape(tokens, tokenize(template, absolute, path)!)\n )\n continue;\n }\n }\n refused.push(toPosixPath(path, path.relative(projectRoot, absolute)));\n }\n if (refused.length > 0)\n return yield* new UnownedConvexEntrypointError({\n filePaths: refused.sort(),\n });\n});\n\nexport const render = ({\n functionNames,\n registeredFunctionsImportPath,\n useNode = false,\n}: Parameters<typeof renderEffect>[0]) =>\n renderEffect({ functionNames, registeredFunctionsImportPath, useNode });\n\nconst renderEffect = Effect.fnUntraced(function* ({\n functionNames,\n registeredFunctionsImportPath,\n useNode = false,\n}: {\n functionNames: ReadonlyArray<string>;\n registeredFunctionsImportPath: string;\n useNode?: boolean;\n}) {\n const cbw = new CodeBlockWriter({ indentNumberOfSpaces: 2 });\n\n if (useNode) {\n yield* cbw.writeLine(`\"use node\";`);\n yield* cbw.blankLine();\n }\n\n yield* cbw.writeLine(\n `import registeredFunctions from \"${registeredFunctionsImportPath}\";`,\n );\n yield* cbw.newLine();\n yield* Effect.forEach(functionNames, (name) =>\n cbw.writeLine(`export const ${name} = registeredFunctions.${name};`),\n );\n\n return yield* cbw.toString();\n});\n\nexport const generateGroupModule = ({\n groupPath,\n functionNames,\n registeredFunctionsImportPath,\n useNode = false,\n}: Parameters<typeof generateGroupModuleEffect>[0]) =>\n generateGroupModuleEffect({\n groupPath,\n functionNames,\n registeredFunctionsImportPath,\n useNode,\n });\n\nconst generateGroupModuleEffect = Effect.fnUntraced(function* ({\n groupPath,\n functionNames,\n registeredFunctionsImportPath,\n useNode = false,\n}: {\n groupPath: GroupPath.GroupPath;\n functionNames: ReadonlyArray<string>;\n registeredFunctionsImportPath: string;\n useNode?: boolean;\n}) {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const convexDirectory = yield* ConvexDirectory.get;\n\n const relativeModulePath = yield* GroupPath.modulePath(groupPath);\n const modulePath = path.join(convexDirectory, relativeModulePath);\n\n const directoryPath = path.dirname(modulePath);\n if (!(yield* fs.exists(directoryPath))) {\n yield* fs.makeDirectory(directoryPath, { recursive: true });\n }\n\n const functionsContentsString = yield* render({\n functionNames,\n registeredFunctionsImportPath,\n useNode,\n });\n\n if (!(yield* fs.exists(modulePath))) {\n yield* fs.writeFileString(modulePath, functionsContentsString);\n return \"Added\" as const;\n }\n const existing = yield* fs.readFileString(modulePath);\n if (existing !== functionsContentsString) {\n yield* fs.writeFileString(modulePath, functionsContentsString);\n return \"Modified\" as const;\n }\n return \"Unchanged\" as const;\n});\n\n/**\n * Compute the module import specifier (relative to `modulePath`) for a group's\n * registry file under `confect/_generated/registeredFunctions/`. The registry\n * path mirrors the group's path one-to-one (see\n * `registeredFunctionsRelativePath` in `LeafModule.ts`) for both Convex and\n * Node groups.\n */\nexport const registeredFunctionsImportPathForGroup = Effect.fnUntraced(\n function* (groupPath: GroupPath.GroupPath, modulePath: string) {\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n\n const registeredFunctionsPath =\n path.join(\n confectDirectory,\n \"_generated\",\n \"registeredFunctions\",\n ...groupPath.pathSegments,\n ) + \".ts\";\n\n return yield* toModuleImportPath(\n path.relative(path.dirname(modulePath), registeredFunctionsPath),\n );\n },\n);\n\nconst logGroupPaths = Effect.fnUntraced(function* <R>(\n groupPaths: GroupPaths.GroupPaths,\n logFn: (fullPath: string) => Effect.Effect<void, never, R>,\n): Effect.fn.Return<void, never, R | Path.Path | ConvexDirectory> {\n const path = yield* Path.Path;\n const convexDirectory = yield* ConvexDirectory.get;\n\n yield* Effect.forEach(\n groupPaths,\n Effect.fnUntraced(function* (gp: GroupPath.GroupPath) {\n const relativeModulePath = yield* GroupPath.modulePath(gp);\n yield* logFn(path.join(convexDirectory, relativeModulePath));\n }),\n );\n});\n\nexport const generateFunctions = Effect.fnUntraced(function* (\n snapshot: GenerationSnapshot.GenerationSnapshot,\n) {\n const groupPathsFromFs = yield* getGroupPathsFromFs;\n yield* applyFunctionPlan(GenerationSnapshot.plan(snapshot, groupPathsFromFs));\n return GenerationSnapshot.functionPaths(snapshot);\n});\n\nexport const applyFunctionPlan = Effect.fnUntraced(function* (\n plan: GenerationSnapshot.ModulePlan,\n) {\n const removed = GroupPaths.GroupPaths.make(\n HashSet.fromIterable(plan.removed),\n );\n yield* removeGroups(removed);\n yield* logGroupPaths(removed, logFileRemoved);\n yield* writeGroups(plan.changed);\n});\n\nconst getGroupPathsFromFs = Effect.gen(function* () {\n const path = yield* Path.Path;\n const allConvexPaths = yield* getEntrypoints;\n const groupPathArray = yield* pipe(\n allConvexPaths,\n Array.filter(\n (convexPath) =>\n path.extname(convexPath) === \".ts\" &&\n !RESERVED_CONVEX_TS_FILE_NAMES.has(path.basename(convexPath)),\n ),\n Effect.forEach((groupModulePath) =>\n GroupPath.fromGroupModulePath(groupModulePath),\n ),\n );\n return GroupPaths.GroupPaths.make(HashSet.fromIterable(groupPathArray));\n});\n\nexport const removeGroups = Effect.fnUntraced(function* (\n groupPaths: GroupPaths.GroupPaths,\n) {\n const path = yield* Path.Path;\n const convexDirectory = yield* ConvexDirectory.get;\n\n yield* Effect.all(\n HashSet.map(groupPaths, (groupPath) =>\n Effect.gen(function* () {\n const relativeModulePath = yield* GroupPath.modulePath(groupPath);\n const modulePath = path.join(convexDirectory, relativeModulePath);\n\n yield* Effect.logDebug(`Removing group '${relativeModulePath}'...`);\n\n yield* removePathIfExists(modulePath);\n yield* Effect.logDebug(`Group '${relativeModulePath}' removed`);\n }),\n ),\n { concurrency: \"unbounded\" },\n );\n});\n\nexport const writeGroups = (\n groups: ReadonlyArray<GenerationSnapshot.GroupSummary>,\n) =>\n Effect.forEach(\n groups,\n Effect.fnUntraced(function* (group: GenerationSnapshot.GroupSummary) {\n const path = yield* Path.Path;\n const convexDirectory = yield* ConvexDirectory.get;\n const relativeModulePath = yield* GroupPath.modulePath(group.path);\n const modulePath = path.join(convexDirectory, relativeModulePath);\n const registeredFunctionsImportPath =\n yield* registeredFunctionsImportPathForGroup(group.path, modulePath);\n const change = yield* generateGroupModule({\n groupPath: group.path,\n functionNames: group.functionNames,\n registeredFunctionsImportPath,\n useNode: group.runtime === \"Node\",\n });\n yield* Match.value(change).pipe(\n Match.when(\"Added\", () => logFileAdded(modulePath)),\n Match.when(\"Modified\", () => logFileModified(modulePath)),\n Match.when(\"Unchanged\", () => Effect.void),\n Match.exhaustive,\n );\n }),\n );\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAyBA,MAAM,gDAAgC,IAAI,IAAI;CAC5C;CACA;CACA;CACA;CACA;AACF,CAAC;AAGD,MAAM,iBAAiB,OAAO,IAAI,aAAa;CAC7C,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,SAAS,OAAO,gBAAgB;CACtC,MAAM,QAAQ,OAAO,GAAG,cAAc,QAAQ,EAAE,WAAW,KAAK,CAAC;CACjE,MAAM,aAAa,MAChB,QACE,SACC,KAAK,SAAS,IAAI,MAAM,sBACxB,KAAK,QAAQ,IAAI,MAAM,GAC3B,CAAC,CACA,KAAK,SAAS,KAAK,QAAQ,IAAI,IAAI,KAAK,GAAG;CAC9C,OAAO,MAAM,QAAQ,SAAS;EAC5B,MAAM,OAAO,KAAK,SAAS,IAAI;EAC/B,OACE,CAAC,KAAK,WAAW,eAAe,KAAK,GAAG,KACxC,CAAC,WAAW,MAAM,cAAc,KAAK,WAAW,SAAS,CAAC,KAC1D,uCAAuC,KAAK,IAAI,KAChD,CAAC,KAAK,WAAW,GAAG,KACpB,CAAC,KAAK,WAAW,GAAG,MACnB,KAAK,MAAM,KAAK,CAAC,EAAE,UAAU,OAAO,KACrC,SAAS,eACT,SAAS,eACT,CAAC,KAAK,SAAS,GAAG;CAEtB,CAAC;AACH,CAAC;AAED,MAAM,YACJ,QACA,YACA,SACyB;CACzB,MAAM,QACJ;CACF,MAAM,SAAmB,CAAC;CAC1B,OAAO,MAAM,YAAY,OAAO,QAAQ;EACtC,MAAM,QAAQ,MAAM,KAAK,MAAM;EAC/B,IAAI,UAAU,MAAM,OAAO,KAAA;EAC3B,MAAM,QAAQ,MAAM;EACpB,IAAI,UAAU,KAAK,KAAK,GAAG;EAC3B,IAAI,MAAM,WAAW,IAAG,KAAK,MAAM,WAAW,GAAG,GAAG;GAClD,MAAM,UAAU,MAAM,MAAM,GAAG,EAAE;GACjC,OAAO,KACL,KAAK,UACH,QAAQ,WAAW,GAAG,IAClB,KAAK,QACH,KAAK,QAAQ,UAAU,GACvB,QAAQ,QAAQ,SAAS,EAAE,CAC7B,IACA,OACN,CACF;EACF,OAAO,OAAO,KAAK,KAAK;CAC1B;CACA,OAAO;AACT;AAEA,MAAM,eAAe,OAAO,WAAW,OAAO,eAAe,OAAO,MAAM,CAAC;AAE3E,MAAM,gBACJ,QACA,aACG;CACH,IAAI,QAAQ;CACZ,KAAK,MAAM,SAAS,UAAU;EAC5B,IAAI,UAAU,OAAO,OAAO,WAAW,KAAK;EAC5C,IAAI,OAAO,WAAW,QAAQ,UAAU,OAAO,UAAU,MAAM;EAC/D,IAAI,OAAO,aAAa,OAAO,OAAO;CACxC;CACA,OAAO,UAAU,OAAO;AAC1B;AAEA,MAAa,yBAAyB,OAAO,IAAI,aAAa;CAC5D,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,SAAS,OAAO,gBAAgB;CACtC,MAAM,UAAU,OAAO,iBAAiB;CACxC,MAAM,cAAc,OAAO,YAAY;CACvC,MAAM,oBAAoB,SACxB,mBAAmB,KAAK,SAAS,QAAQ,KAAK,KAAK,SAAS,IAAI,CAAC,CAAC;CACpE,MAAM,2BAAW,IAAI,IAAI,CACvB,CACE,WACA;EACE,OAAOA,KAAe,EACpB,gBAAgB,OAAO,iBAAiB,SAAS,EACnD,CAAC;EACD,OAAOC,aAAuB;GAC5B,kBAAkB,OAAO,iBAAiB,sBAAsB;GAChE,gBAAgB,OAAO,iBAAiB,SAAS;EACnD,CAAC;EACD,OAAOA,aAAuB;GAC5B,kBAAkB,OAAO,iBAAiB,sBAAsB;GAChE,gBAAgB,OAAO,iBAAiB,SAAS;GACjD,mBAAmB,OAAO,iBAAiB,YAAY;EACzD,CAAC;CACH,CACF,GACA,CACE,YACA,CACE,OAAOC,MAAgB,EACrB,iBAAiB,OAAO,iBAAiB,UAAU,EACrD,CAAC,CACH,CACF,CACF,CAAC;CAED,MAAM,iBAAiB,IAAI,KACxB,OAAOC,QAAAA,CAAsB,KAAK,SACjC,aACE,KAAK,KAAK,SAAS,cAAc,KAAK,SAAS,MAAM,KAAK,CAAC,CAC7D,CACF,CACF;CACA,MAAM,yBACJ,WAEA,OAAO,OAAO,YAAY,eAAe,IAAI,OAAO,MAAM,EAAE,IACxD,sBAAsB,OAAO,MAAM,OAAO,OAAO,MAAM,IAAI,CAAC,CAAC,IAC7D;CACN,MAAM,UAAoB,CAAC;CAC3B,KAAK,MAAM,YAAY,OAAO,gBAAgB;EAC5C,MAAM,WAAW,KAAK,KAAK,QAAQ,QAAQ;EAC3C,MAAM,SAAS,SAAS,OAAO,GAAG,eAAe,QAAQ,GAAG,UAAU,IAAI;EAC1E,IAAI,WAAW,KAAA,GAAW;GACxB,IACE,SACG,IAAI,QAAQ,CAAC,EACZ,MAAM,aACN,aACE,aAAa,YAAY,sBAAsB,MAAM,IAAI,QACzD,SAAS,UAAU,UAAU,IAAI,CACnC,CACF,GAEF;GACF,IAAI,KAAK,QAAQ,QAAQ,MAAM,OAAO;IACpC,MAAM,QAAQ,OAAO,SAAS,OAAO,UACnC,UAAU,YAAY,OAAO,QAAQ,OAAO,UACxC,CAAC,OAAO,QAAQ,EAAG,IACnB,CAAC,CACP;IACA,MAAM,QAAQ,OAAOC,oBAA8B,QAAQ;IAC3D,MAAM,WAAW,OAAO,OAAO;KAC7B,eAAe;KACf,+BACE,OAAO,sCAAsC,OAAO,QAAQ;KAC9D,SAAS,OAAO,OAAO;IACzB,CAAC;IACD,IACE,MAAM,SAAS,KACf,IAAI,IAAI,KAAK,CAAC,CAAC,SAAS,MAAM,UAC9B,aAAa,QAAQ,SAAS,UAAU,UAAU,IAAI,CAAE,GAExD;GACJ;EACF;EACA,QAAQ,KAAK,YAAY,MAAM,KAAK,SAAS,aAAa,QAAQ,CAAC,CAAC;CACtE;CACA,IAAI,QAAQ,SAAS,GACnB,OAAO,OAAO,IAAI,6BAA6B,EAC7C,WAAW,QAAQ,KAAK,EAC1B,CAAC;AACL,CAAC;AAED,MAAa,UAAU,EACrB,eACA,+BACA,UAAU,YAEV,aAAa;CAAE;CAAe;CAA+B;AAAQ,CAAC;AAExE,MAAM,eAAe,OAAO,WAAW,WAAW,EAChD,eACA,+BACA,UAAU,SAKT;CACD,MAAM,MAAM,IAAI,gBAAgB,EAAE,sBAAsB,EAAE,CAAC;CAE3D,IAAI,SAAS;EACX,OAAO,IAAI,UAAU,aAAa;EAClC,OAAO,IAAI,UAAU;CACvB;CAEA,OAAO,IAAI,UACT,oCAAoC,8BAA8B,GACpE;CACA,OAAO,IAAI,QAAQ;CACnB,OAAO,OAAO,QAAQ,gBAAgB,SACpC,IAAI,UAAU,gBAAgB,KAAK,yBAAyB,KAAK,EAAE,CACrE;CAEA,OAAO,OAAO,IAAI,SAAS;AAC7B,CAAC;AAED,MAAa,uBAAuB,EAClC,WACA,eACA,+BACA,UAAU,YAEV,0BAA0B;CACxB;CACA;CACA;CACA;AACF,CAAC;AAEH,MAAM,4BAA4B,OAAO,WAAW,WAAW,EAC7D,WACA,eACA,+BACA,UAAU,SAMT;CACD,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,kBAAkB,OAAO,gBAAgB;CAE/C,MAAM,qBAAqB,OAAOC,WAAqB,SAAS;CAChE,MAAMC,eAAa,KAAK,KAAK,iBAAiB,kBAAkB;CAEhE,MAAM,gBAAgB,KAAK,QAAQA,YAAU;CAC7C,IAAI,EAAE,OAAO,GAAG,OAAO,aAAa,IAClC,OAAO,GAAG,cAAc,eAAe,EAAE,WAAW,KAAK,CAAC;CAG5D,MAAM,0BAA0B,OAAO,OAAO;EAC5C;EACA;EACA;CACF,CAAC;CAED,IAAI,EAAE,OAAO,GAAG,OAAOA,YAAU,IAAI;EACnC,OAAO,GAAG,gBAAgBA,cAAY,uBAAuB;EAC7D,OAAO;CACT;CAEA,KAAI,OADoB,GAAG,eAAeA,YAAU,OACnC,yBAAyB;EACxC,OAAO,GAAG,gBAAgBA,cAAY,uBAAuB;EAC7D,OAAO;CACT;CACA,OAAO;AACT,CAAC;;;;;;;;AASD,MAAa,wCAAwC,OAAO,WAC1D,WAAW,WAAgC,YAAoB;CAC7D,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,mBAAmB,OAAO,iBAAiB;CAEjD,MAAM,0BACJ,KAAK,KACH,kBACA,cACA,uBACA,GAAG,UAAU,YACf,IAAI;CAEN,OAAO,OAAO,mBACZ,KAAK,SAAS,KAAK,QAAQ,UAAU,GAAG,uBAAuB,CACjE;AACF,CACF;AAEA,MAAM,gBAAgB,OAAO,WAAW,WACtC,YACA,OACgE;CAChE,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,kBAAkB,OAAO,gBAAgB;CAE/C,OAAO,OAAO,QACZ,YACA,OAAO,WAAW,WAAW,IAAyB;EACpD,MAAM,qBAAqB,OAAOD,WAAqB,EAAE;EACzD,OAAO,MAAM,KAAK,KAAK,iBAAiB,kBAAkB,CAAC;CAC7D,CAAC,CACH;AACF,CAAC;AAED,MAAa,oBAAoB,OAAO,WAAW,WACjD,UACA;CACA,MAAM,mBAAmB,OAAO;CAChC,OAAO,kBAAkBE,KAAwB,UAAU,gBAAgB,CAAC;CAC5E,OAAOC,cAAiC,QAAQ;AAClD,CAAC;AAED,MAAa,oBAAoB,OAAO,WAAW,WACjD,MACA;CACA,MAAM,UAAA,WAAgC,KACpC,QAAQ,aAAa,KAAK,OAAO,CACnC;CACA,OAAO,aAAa,OAAO;CAC3B,OAAO,cAAc,SAAS,cAAc;CAC5C,OAAO,YAAY,KAAK,OAAO;AACjC,CAAC;AAED,MAAM,sBAAsB,OAAO,IAAI,aAAa;CAClD,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,iBAAiB,OAAO;CAC9B,MAAM,iBAAiB,OAAO,KAC5B,gBACA,MAAM,QACH,eACC,KAAK,QAAQ,UAAU,MAAM,SAC7B,CAAC,8BAA8B,IAAI,KAAK,SAAS,UAAU,CAAC,CAChE,GACA,OAAO,SAAS,oBACdJ,oBAA8B,eAAe,CAC/C,CACF;CACA,OAAA,WAA6B,KAAK,QAAQ,aAAa,cAAc,CAAC;AACxE,CAAC;AAED,MAAa,eAAe,OAAO,WAAW,WAC5C,YACA;CACA,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,kBAAkB,OAAO,gBAAgB;CAE/C,OAAO,OAAO,IACZ,QAAQ,IAAI,aAAa,cACvB,OAAO,IAAI,aAAa;EACtB,MAAM,qBAAqB,OAAOC,WAAqB,SAAS;EAChE,MAAMC,eAAa,KAAK,KAAK,iBAAiB,kBAAkB;EAEhE,OAAO,OAAO,SAAS,mBAAmB,mBAAmB,KAAK;EAElE,OAAO,mBAAmBA,YAAU;EACpC,OAAO,OAAO,SAAS,UAAU,mBAAmB,UAAU;CAChE,CAAC,CACH,GACA,EAAE,aAAa,YAAY,CAC7B;AACF,CAAC;AAED,MAAa,eACX,WAEA,OAAO,QACL,QACA,OAAO,WAAW,WAAW,OAAwC;CACnE,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,kBAAkB,OAAO,gBAAgB;CAC/C,MAAM,qBAAqB,OAAOD,WAAqB,MAAM,IAAI;CACjE,MAAMC,eAAa,KAAK,KAAK,iBAAiB,kBAAkB;CAChE,MAAM,gCACJ,OAAO,sCAAsC,MAAM,MAAMA,YAAU;CACrE,MAAM,SAAS,OAAO,oBAAoB;EACxC,WAAW,MAAM;EACjB,eAAe,MAAM;EACrB;EACA,SAAS,MAAM,YAAY;CAC7B,CAAC;CACD,OAAO,MAAM,MAAM,MAAM,CAAC,CAAC,KACzB,MAAM,KAAK,eAAe,aAAaA,YAAU,CAAC,GAClD,MAAM,KAAK,kBAAkB,gBAAgBA,YAAU,CAAC,GACxD,MAAM,KAAK,mBAAmB,OAAO,IAAI,GACzC,MAAM,UACR;AACF,CAAC,CACH"}
|
package/dist/SectionFiles.mjs
CHANGED
|
@@ -8,6 +8,7 @@ import * as Effect from "effect/Effect";
|
|
|
8
8
|
import * as FileSystem from "effect/FileSystem";
|
|
9
9
|
import * as Path from "effect/Path";
|
|
10
10
|
import * as Result from "effect/Result";
|
|
11
|
+
import * as Option from "effect/Option";
|
|
11
12
|
import * as Schema from "effect/Schema";
|
|
12
13
|
//#region src/SectionFiles.ts
|
|
13
14
|
/**
|
|
@@ -19,7 +20,10 @@ const builtIn = new Set(`spec schema convexSchema id components component refs d
|
|
|
19
20
|
nodeRegisteredFunctions`.split(/\s+/).map((name) => `${name}.ts`));
|
|
20
21
|
const PREFIX = "// Generated by `confect codegen` from the manifest section ";
|
|
21
22
|
const header = (key) => `${PREFIX}${JSON.stringify(key)}. Do not edit.`;
|
|
22
|
-
const
|
|
23
|
+
const Sources = Schema.fromJsonString(Schema.Array(Schema.String));
|
|
24
|
+
const encodeSources = Schema.encodeSync(Sources);
|
|
25
|
+
const decodeSources = Schema.decodeUnknownOption(Sources);
|
|
26
|
+
const INPUTS = "sectionInputs.json";
|
|
23
27
|
const visit = (leaves, each) => {
|
|
24
28
|
const walk = (group, path, source) => {
|
|
25
29
|
for (const spec of Object.values(group.functions)) each(spec, `${path}:${spec.name}`, source);
|
|
@@ -58,7 +62,7 @@ const sourceFiles = Effect.gen(function* () {
|
|
|
58
62
|
const confectDirectory = yield* ConfectDirectory.get;
|
|
59
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();
|
|
60
64
|
});
|
|
61
|
-
const render = Effect.fnUntraced(function* ({ key, generate }, input, files) {
|
|
65
|
+
const render = Effect.fnUntraced(function* ({ key, generate }, input, files, watched) {
|
|
62
66
|
const path = yield* Path.Path;
|
|
63
67
|
const confectDirectory = yield* ConfectDirectory.get;
|
|
64
68
|
const failed = (cause) => new InvalidManifestSectionError({
|
|
@@ -69,10 +73,22 @@ const render = Effect.fnUntraced(function* ({ key, generate }, input, files) {
|
|
|
69
73
|
try: () => files.filter((file) => generate.match(file)),
|
|
70
74
|
catch: failed
|
|
71
75
|
});
|
|
72
|
-
const
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
+
for (const file of matched) watched.add(file);
|
|
77
|
+
const modules = yield* Effect.forEach(matched, (relativePath) => {
|
|
78
|
+
const entry = path.join(confectDirectory, relativePath);
|
|
79
|
+
return bundle(entry, { plugins: [{
|
|
80
|
+
name: "confect:section-inputs",
|
|
81
|
+
setup: (build) => build.onEnd(({ metafile }) => {
|
|
82
|
+
for (const loaded of Object.keys(metafile?.inputs ?? {})) {
|
|
83
|
+
const file = toPosixPath(path, path.relative(confectDirectory, path.resolve(path.dirname(entry), loaded)));
|
|
84
|
+
if (!file.startsWith("../") && !file.startsWith("_generated/")) watched.add(file);
|
|
85
|
+
}
|
|
86
|
+
})
|
|
87
|
+
}] }).pipe(Effect.map(({ module }) => ({
|
|
88
|
+
relativePath,
|
|
89
|
+
exports: module
|
|
90
|
+
})), Effect.mapError((error) => fromBundlerError(`confect/${relativePath}`, error)));
|
|
91
|
+
});
|
|
76
92
|
const { contents, errors } = yield* Effect.try({
|
|
77
93
|
try: () => generate.render({
|
|
78
94
|
...input,
|
|
@@ -93,13 +109,35 @@ const render = Effect.fnUntraced(function* ({ key, generate }, input, files) {
|
|
|
93
109
|
].join("\n");
|
|
94
110
|
});
|
|
95
111
|
/**
|
|
112
|
+
* The files in `confect/_generated` a section wrote, which carry its header.
|
|
113
|
+
*/
|
|
114
|
+
const written = Effect.gen(function* () {
|
|
115
|
+
const fs = yield* FileSystem.FileSystem;
|
|
116
|
+
const path = yield* Path.Path;
|
|
117
|
+
const generated = path.join(yield* ConfectDirectory.get, "_generated");
|
|
118
|
+
if (!(yield* fs.exists(generated))) return [];
|
|
119
|
+
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))));
|
|
120
|
+
});
|
|
121
|
+
/**
|
|
122
|
+
* The `confect/` files the generating sections matched and the `confect/` files
|
|
123
|
+
* those import, as recorded by the last codegen run that loaded them.
|
|
124
|
+
*/
|
|
125
|
+
const inputs = Effect.gen(function* () {
|
|
126
|
+
const fs = yield* FileSystem.FileSystem;
|
|
127
|
+
const record = (yield* Path.Path).join(yield* ConfectDirectory.get, "_generated", INPUTS);
|
|
128
|
+
const none = [];
|
|
129
|
+
if (!(yield* fs.exists(record))) return none;
|
|
130
|
+
return Option.getOrElse(decodeSources(yield* fs.readFileString(record)), () => none);
|
|
131
|
+
});
|
|
132
|
+
/**
|
|
96
133
|
* Write each claimed file into `confect/_generated` once every section has
|
|
97
|
-
* rendered
|
|
98
|
-
*
|
|
99
|
-
* the
|
|
134
|
+
* rendered. Every section renders before codegen fails with the first error
|
|
135
|
+
* after logging the rest. The record of section inputs is written either way,
|
|
136
|
+
* keeping the previous inputs after a failure, so `confect dev` sees the fix.
|
|
137
|
+
* Returns the claimed file names and whether they differ from the section files
|
|
138
|
+
* that existed before.
|
|
100
139
|
*/
|
|
101
140
|
const sync = Effect.fnUntraced(function* (leaves, mounts) {
|
|
102
|
-
const fs = yield* FileSystem.FileSystem;
|
|
103
141
|
const path = yield* Path.Path;
|
|
104
142
|
const generated = path.join(yield* ConfectDirectory.get, "_generated");
|
|
105
143
|
const claimed = yield* Effect.fromResult(claims(leaves));
|
|
@@ -109,28 +147,41 @@ const sync = Effect.fnUntraced(function* (leaves, mounts) {
|
|
|
109
147
|
source
|
|
110
148
|
}));
|
|
111
149
|
const files = claimed.length === 0 ? [] : yield* sourceFiles;
|
|
150
|
+
const watched = /* @__PURE__ */ new Set();
|
|
112
151
|
const [rendered, failures] = yield* Effect.partition(claimed, (claim) => render(claim, {
|
|
113
152
|
functions,
|
|
114
153
|
mounts
|
|
115
|
-
}, files).pipe(Effect.map((contents) => ({
|
|
154
|
+
}, files, watched).pipe(Effect.map((contents) => ({
|
|
116
155
|
file: claim.generate.file,
|
|
117
156
|
contents
|
|
118
157
|
}))));
|
|
158
|
+
if (failures.length > 0) for (const file of yield* inputs) watched.add(file);
|
|
159
|
+
yield* claimed.length === 0 ? removePathIfExists(path.join(generated, INPUTS)) : writeFileStringAndLog(path.join(generated, INPUTS), encodeSources([...watched].sort()));
|
|
119
160
|
const [error, ...more] = failures;
|
|
120
161
|
for (const other of more) yield* logCodegenError(other);
|
|
121
162
|
if (error !== void 0) return yield* error;
|
|
163
|
+
const existing = yield* written;
|
|
122
164
|
for (const { file, contents } of rendered) yield* writeFileStringAndLog(path.join(generated, file), contents);
|
|
123
165
|
const names = rendered.map(({ file }) => file);
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
166
|
+
return {
|
|
167
|
+
files: names,
|
|
168
|
+
changed: names.length !== existing.length || names.some((file) => !existing.includes(file))
|
|
169
|
+
};
|
|
170
|
+
});
|
|
171
|
+
/**
|
|
172
|
+
* Remove each file a section wrote that is not in `files`. Codegen runs this
|
|
173
|
+
* after it rewrites the registration files and the HTTP router, so a run that
|
|
174
|
+
* fails earlier leaves no import of a removed file.
|
|
175
|
+
*/
|
|
176
|
+
const removeUnclaimed = Effect.fnUntraced(function* (files) {
|
|
177
|
+
const path = yield* Path.Path;
|
|
178
|
+
const generated = path.join(yield* ConfectDirectory.get, "_generated");
|
|
179
|
+
for (const file of yield* written) if (!files.includes(file)) {
|
|
180
|
+
yield* removePathIfExists(path.join(generated, file));
|
|
181
|
+
yield* logFileRemoved(path.join(generated, file));
|
|
130
182
|
}
|
|
131
|
-
return names;
|
|
132
183
|
});
|
|
133
184
|
//#endregion
|
|
134
|
-
export { builtIn, claims, sync };
|
|
185
|
+
export { builtIn, claims, inputs, removeUnclaimed, sync, written };
|
|
135
186
|
|
|
136
187
|
//# sourceMappingURL=SectionFiles.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SectionFiles.mjs","names":["Bundler.bundle"],"sources":["../src/SectionFiles.ts"],"sourcesContent":["import type { FunctionSpec, GroupSpec, ManifestSection } from \"@confect/core\";\nimport * as Effect from \"effect/Effect\";\nimport * as FileSystem from \"effect/FileSystem\";\nimport * as Path from \"effect/Path\";\nimport * as Result from \"effect/Result\";\nimport * as Schema from \"effect/Schema\";\nimport { fromBundlerError } from \"./BuildError.js\";\nimport * as Bundler from \"./Bundler.js\";\nimport {\n InvalidManifestSectionError,\n logCodegenError,\n} from \"./CodegenError.js\";\nimport { ConfectDirectory } from \"./ConfectDirectory.js\";\nimport type { LoadedLeafModule } from \"./LeafModule.js\";\nimport { logFileRemoved } from \"./log.js\";\nimport {\n removePathIfExists,\n toPosixPath,\n writeFileStringAndLog,\n} from \"./utils.js\";\n\ntype Leaf = Pick<LoadedLeafModule, \"spec\" | \"pathSegments\" | \"relativePath\">;\n\n/**\n * The files codegen writes directly in `confect/_generated`, current and\n * legacy, which no section may claim.\n */\nexport const builtIn: ReadonlySet<string> = new Set(\n `spec schema convexSchema id components component refs docs services manifest\n auth.providers testing api nodeApi impl nodeImpl nodeSpec registeredFunctions\n nodeRegisteredFunctions`\n .split(/\\s+/)\n .map((name) => `${name}.ts`),\n);\n\nconst PREFIX = \"// Generated by `confect codegen` from the manifest section \";\nconst header = (key: string) => `${PREFIX}${JSON.stringify(key)}. Do not edit.`;\nconst encodeSources = Schema.encodeSync(\n Schema.fromJsonString(Schema.Array(Schema.String)),\n);\n\ninterface Claim {\n readonly key: string;\n readonly generate: ManifestSection.Generate;\n}\n\nconst visit = (\n leaves: ReadonlyArray<Leaf>,\n each: (spec: FunctionSpec.AnyWithProps, path: string, source: string) => void,\n) => {\n const walk = (\n group: GroupSpec.AnyWithProps,\n path: string,\n source: string,\n ) => {\n for (const spec of Object.values(group.functions))\n each(spec, `${path}:${spec.name}`, source);\n for (const [name, child] of Object.entries(group.groups))\n walk(child, `${path}/${name}`, source);\n };\n for (const leaf of leaves)\n walk(leaf.spec, leaf.pathSegments.join(\"/\"), leaf.relativePath);\n};\n\n/**\n * One claim per section key that generates a file, ordered by file. A name that\n * is built in, not a `.ts` file directly in `_generated`, or claimed by two\n * keys is refused.\n */\nexport const claims = (leaves: ReadonlyArray<Leaf>) =>\n Result.gen(function* () {\n const byKey = new Map<string, ManifestSection.Generate>();\n visit(leaves, (spec) => {\n for (const { key, section } of spec.manifestSections ?? [])\n if (section.generate !== undefined && !byKey.has(key))\n byKey.set(key, section.generate);\n });\n const byFile = new Map<string, string>();\n for (const [key, { file }] of byKey) {\n const other = byFile.get(file);\n const refusal = builtIn.has(file)\n ? `claims confect/_generated/${file}, which codegen writes itself.`\n : !/^[\\w-]+\\.ts$/.test(file)\n ? `claims ${JSON.stringify(file)}; name a .ts file directly inside confect/_generated.`\n : other !== undefined\n ? `claims confect/_generated/${file}, which the manifest section ${JSON.stringify(other)} also claims.`\n : undefined;\n if (refusal !== undefined)\n return yield* Result.fail(\n new InvalidManifestSectionError({ sectionKey: key, reason: refusal }),\n );\n byFile.set(file, key);\n }\n return [...byKey]\n .map(([key, generate]) => ({ key, generate }))\n .sort((a, b) => a.generate.file.localeCompare(b.generate.file));\n });\n\nconst sourceFiles = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n return (yield* fs.readDirectory(confectDirectory, { recursive: true }))\n .map((file) => toPosixPath(path, file))\n .filter(\n (file) =>\n file.endsWith(\".ts\") &&\n !file.endsWith(\".d.ts\") &&\n !file.split(\"/\").includes(\"_generated\"),\n )\n .sort();\n});\n\nconst render = Effect.fnUntraced(function* (\n { key, generate }: Claim,\n input: Omit<ManifestSection.GenerateInput, \"modules\">,\n files: ReadonlyArray<string>,\n) {\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n const failed = (cause: unknown) =>\n new InvalidManifestSectionError({\n sectionKey: key,\n reason: `generate failed: ${String(cause)}`,\n });\n const matched = yield* Effect.try({\n try: () => files.filter((file) => generate.match(file)),\n catch: failed,\n });\n const modules = yield* Effect.forEach(matched, (relativePath) =>\n Bundler.bundle(path.join(confectDirectory, relativePath)).pipe(\n Effect.map(({ module }) => ({ relativePath, exports: module })),\n Effect.mapError((error) =>\n fromBundlerError(`confect/${relativePath}`, error),\n ),\n ),\n );\n const { contents, errors } = yield* Effect.try({\n try: () => generate.render({ ...input, modules }),\n catch: failed,\n });\n const [error, ...more] = errors.map(\n (reason) => new InvalidManifestSectionError({ sectionKey: key, reason }),\n );\n for (const other of more) yield* logCodegenError(other);\n if (error !== undefined) return yield* error;\n return [header(key), `// Sources: ${encodeSources(matched)}`, contents].join(\n \"\\n\",\n );\n});\n\n/**\n * Write each claimed file into `confect/_generated` once every section has\n * rendered, and remove a file a section wrote that no section claims any more.\n * Every section renders before codegen fails with the first error after logging\n * the rest. Returns the claimed file names.\n */\nexport const sync = Effect.fnUntraced(function* (\n leaves: ReadonlyArray<Leaf>,\n mounts: ManifestSection.GenerateInput[\"mounts\"],\n) {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const generated = path.join(yield* ConfectDirectory.get, \"_generated\");\n const claimed = yield* Effect.fromResult(claims(leaves));\n const functions: Array<{ path: string; source: string }> = [];\n visit(leaves, (_, functionPath, source) =>\n functions.push({ path: functionPath, source }),\n );\n const files = claimed.length === 0 ? [] : yield* sourceFiles;\n const [rendered, failures] = yield* Effect.partition(claimed, (claim) =>\n render(claim, { functions, mounts }, files).pipe(\n Effect.map((contents) => ({ file: claim.generate.file, contents })),\n ),\n );\n const [error, ...more] = failures;\n for (const other of more) yield* logCodegenError(other);\n if (error !== undefined) return yield* error;\n for (const { file, contents } of rendered)\n yield* writeFileStringAndLog(path.join(generated, file), contents);\n const names = rendered.map(({ file }) => file);\n for (const file of yield* fs.readDirectory(generated)) {\n const absolutePath = path.join(generated, file);\n if (\n file.endsWith(\".ts\") &&\n !names.includes(file) &&\n (yield* fs.readFileString(absolutePath)).startsWith(PREFIX)\n ) {\n yield* removePathIfExists(absolutePath);\n yield* logFileRemoved(absolutePath);\n }\n }\n return names;\n});\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SectionFiles.mjs","names":["Bundler.bundle"],"sources":["../src/SectionFiles.ts"],"sourcesContent":["import type { FunctionSpec, GroupSpec, ManifestSection } from \"@confect/core\";\nimport type * as esbuild from \"esbuild\";\nimport * as Effect from \"effect/Effect\";\nimport * as FileSystem from \"effect/FileSystem\";\nimport * as Option from \"effect/Option\";\nimport * as Path from \"effect/Path\";\nimport * as Result from \"effect/Result\";\nimport * as Schema from \"effect/Schema\";\nimport { fromBundlerError } from \"./BuildError.js\";\nimport * as Bundler from \"./Bundler.js\";\nimport {\n InvalidManifestSectionError,\n logCodegenError,\n} from \"./CodegenError.js\";\nimport { ConfectDirectory } from \"./ConfectDirectory.js\";\nimport type { LoadedLeafModule } from \"./LeafModule.js\";\nimport { logFileRemoved } from \"./log.js\";\nimport {\n removePathIfExists,\n toPosixPath,\n writeFileStringAndLog,\n} from \"./utils.js\";\n\ntype Leaf = Pick<LoadedLeafModule, \"spec\" | \"pathSegments\" | \"relativePath\">;\n\n/**\n * The files codegen writes directly in `confect/_generated`, current and\n * legacy, which no section may claim.\n */\nexport const builtIn: ReadonlySet<string> = new Set(\n `spec schema convexSchema id components component refs docs services manifest\n auth.providers testing api nodeApi impl nodeImpl nodeSpec registeredFunctions\n nodeRegisteredFunctions`\n .split(/\\s+/)\n .map((name) => `${name}.ts`),\n);\n\nconst PREFIX = \"// Generated by `confect codegen` from the manifest section \";\nconst header = (key: string) => `${PREFIX}${JSON.stringify(key)}. Do not edit.`;\nconst Sources = Schema.fromJsonString(Schema.Array(Schema.String));\nconst encodeSources = Schema.encodeSync(Sources);\nconst decodeSources = Schema.decodeUnknownOption(Sources);\nconst INPUTS = \"sectionInputs.json\";\n\ninterface Claim {\n readonly key: string;\n readonly generate: ManifestSection.Generate;\n}\n\nconst visit = (\n leaves: ReadonlyArray<Leaf>,\n each: (spec: FunctionSpec.AnyWithProps, path: string, source: string) => void,\n) => {\n const walk = (\n group: GroupSpec.AnyWithProps,\n path: string,\n source: string,\n ) => {\n for (const spec of Object.values(group.functions))\n each(spec, `${path}:${spec.name}`, source);\n for (const [name, child] of Object.entries(group.groups))\n walk(child, `${path}/${name}`, source);\n };\n for (const leaf of leaves)\n walk(leaf.spec, leaf.pathSegments.join(\"/\"), leaf.relativePath);\n};\n\n/**\n * One claim per section key that generates a file, ordered by file. A name that\n * is built in, not a `.ts` file directly in `_generated`, or claimed by two\n * keys is refused.\n */\nexport const claims = (leaves: ReadonlyArray<Leaf>) =>\n Result.gen(function* () {\n const byKey = new Map<string, ManifestSection.Generate>();\n visit(leaves, (spec) => {\n for (const { key, section } of spec.manifestSections ?? [])\n if (section.generate !== undefined && !byKey.has(key))\n byKey.set(key, section.generate);\n });\n const byFile = new Map<string, string>();\n for (const [key, { file }] of byKey) {\n const other = byFile.get(file);\n const refusal = builtIn.has(file)\n ? `claims confect/_generated/${file}, which codegen writes itself.`\n : !/^[\\w-]+\\.ts$/.test(file)\n ? `claims ${JSON.stringify(file)}; name a .ts file directly inside confect/_generated.`\n : other !== undefined\n ? `claims confect/_generated/${file}, which the manifest section ${JSON.stringify(other)} also claims.`\n : undefined;\n if (refusal !== undefined)\n return yield* Result.fail(\n new InvalidManifestSectionError({ sectionKey: key, reason: refusal }),\n );\n byFile.set(file, key);\n }\n return [...byKey]\n .map(([key, generate]) => ({ key, generate }))\n .sort((a, b) => a.generate.file.localeCompare(b.generate.file));\n });\n\nconst sourceFiles = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n return (yield* fs.readDirectory(confectDirectory, { recursive: true }))\n .map((file) => toPosixPath(path, file))\n .filter(\n (file) =>\n file.endsWith(\".ts\") &&\n !file.endsWith(\".d.ts\") &&\n !file.split(\"/\").includes(\"_generated\"),\n )\n .sort();\n});\n\nconst render = Effect.fnUntraced(function* (\n { key, generate }: Claim,\n input: Omit<ManifestSection.GenerateInput, \"modules\">,\n files: ReadonlyArray<string>,\n watched: Set<string>,\n) {\n const path = yield* Path.Path;\n const confectDirectory = yield* ConfectDirectory.get;\n const failed = (cause: unknown) =>\n new InvalidManifestSectionError({\n sectionKey: key,\n reason: `generate failed: ${String(cause)}`,\n });\n const matched = yield* Effect.try({\n try: () => files.filter((file) => generate.match(file)),\n catch: failed,\n });\n for (const file of matched) watched.add(file);\n const modules = yield* Effect.forEach(matched, (relativePath) => {\n const entry = path.join(confectDirectory, relativePath);\n // Inputs are recorded once esbuild finishes, before the module runs, so a\n // module that throws on load still has its imports watched. `confect dev`\n // sees changes only under `confect/`, and every run rewrites `_generated`,\n // so watching it would loop.\n const recordInputs: esbuild.Plugin = {\n name: \"confect:section-inputs\",\n setup: (build) =>\n build.onEnd(({ metafile }) => {\n for (const loaded of Object.keys(metafile?.inputs ?? {})) {\n const file = toPosixPath(\n path,\n path.relative(\n confectDirectory,\n path.resolve(path.dirname(entry), loaded),\n ),\n );\n if (!file.startsWith(\"../\") && !file.startsWith(\"_generated/\"))\n watched.add(file);\n }\n }),\n };\n return Bundler.bundle(entry, { plugins: [recordInputs] }).pipe(\n Effect.map(({ module }) => ({ relativePath, exports: module })),\n Effect.mapError((error) =>\n fromBundlerError(`confect/${relativePath}`, error),\n ),\n );\n });\n const { contents, errors } = yield* Effect.try({\n try: () => generate.render({ ...input, modules }),\n catch: failed,\n });\n const [error, ...more] = errors.map(\n (reason) => new InvalidManifestSectionError({ sectionKey: key, reason }),\n );\n for (const other of more) yield* logCodegenError(other);\n if (error !== undefined) return yield* error;\n return [header(key), `// Sources: ${encodeSources(matched)}`, contents].join(\n \"\\n\",\n );\n});\n\n/**\n * The files in `confect/_generated` a section wrote, which carry its header.\n */\nexport const written = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const generated = path.join(yield* ConfectDirectory.get, \"_generated\");\n if (!(yield* fs.exists(generated))) return [];\n return yield* Effect.filter(\n (yield* fs.readDirectory(generated)).filter((file) => file.endsWith(\".ts\")),\n (file) =>\n fs\n .readFileString(path.join(generated, file))\n .pipe(Effect.map((contents) => contents.startsWith(PREFIX))),\n );\n});\n\n/**\n * The `confect/` files the generating sections matched and the `confect/` files\n * those import, as recorded by the last codegen run that loaded them.\n */\nexport const inputs = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const record = path.join(yield* ConfectDirectory.get, \"_generated\", INPUTS);\n const none: ReadonlyArray<string> = [];\n if (!(yield* fs.exists(record))) return none;\n return Option.getOrElse(\n decodeSources(yield* fs.readFileString(record)),\n () => none,\n );\n});\n\n/**\n * Write each claimed file into `confect/_generated` once every section has\n * rendered. Every section renders before codegen fails with the first error\n * after logging the rest. The record of section inputs is written either way,\n * keeping the previous inputs after a failure, so `confect dev` sees the fix.\n * Returns the claimed file names and whether they differ from the section files\n * that existed before.\n */\nexport const sync = Effect.fnUntraced(function* (\n leaves: ReadonlyArray<Leaf>,\n mounts: ManifestSection.GenerateInput[\"mounts\"],\n) {\n const path = yield* Path.Path;\n const generated = path.join(yield* ConfectDirectory.get, \"_generated\");\n const claimed = yield* Effect.fromResult(claims(leaves));\n const functions: Array<{ path: string; source: string }> = [];\n visit(leaves, (_, functionPath, source) =>\n functions.push({ path: functionPath, source }),\n );\n const files = claimed.length === 0 ? [] : yield* sourceFiles;\n const watched = new Set<string>();\n const [rendered, failures] = yield* Effect.partition(claimed, (claim) =>\n render(claim, { functions, mounts }, files, watched).pipe(\n Effect.map((contents) => ({ file: claim.generate.file, contents })),\n ),\n );\n if (failures.length > 0) for (const file of yield* inputs) watched.add(file);\n yield* claimed.length === 0\n ? removePathIfExists(path.join(generated, INPUTS))\n : writeFileStringAndLog(\n path.join(generated, INPUTS),\n encodeSources([...watched].sort()),\n );\n const [error, ...more] = failures;\n for (const other of more) yield* logCodegenError(other);\n if (error !== undefined) return yield* error;\n const existing = yield* written;\n for (const { file, contents } of rendered)\n yield* writeFileStringAndLog(path.join(generated, file), contents);\n const names = rendered.map(({ file }) => file);\n return {\n files: names,\n changed:\n names.length !== existing.length ||\n names.some((file) => !existing.includes(file)),\n };\n});\n\n/**\n * Remove each file a section wrote that is not in `files`. Codegen runs this\n * after it rewrites the registration files and the HTTP router, so a run that\n * fails earlier leaves no import of a removed file.\n */\nexport const removeUnclaimed = Effect.fnUntraced(function* (\n files: ReadonlyArray<string>,\n) {\n const path = yield* Path.Path;\n const generated = path.join(yield* ConfectDirectory.get, \"_generated\");\n for (const file of yield* written)\n if (!files.includes(file)) {\n yield* removePathIfExists(path.join(generated, file));\n yield* logFileRemoved(path.join(generated, file));\n }\n});\n"],"mappings":"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"}
|
package/dist/Watcher.mjs
CHANGED
|
@@ -3,6 +3,7 @@ import { bundleWorkspacePlugin } from "./Bundler.mjs";
|
|
|
3
3
|
import { ConvexDirectory } from "./ConvexDirectory.mjs";
|
|
4
4
|
import { ConfectDirectory } from "./ConfectDirectory.mjs";
|
|
5
5
|
import "./ConvexConfig.mjs";
|
|
6
|
+
import { inputs } from "./SectionFiles.mjs";
|
|
6
7
|
import { Kind, discover, isOptional, parse } from "./EntryPoint.mjs";
|
|
7
8
|
import { add, empty, full, reconcile } from "./SyncState.mjs";
|
|
8
9
|
import { Change, Failure, Outcome, State, captureBarrier, complete, diagnostics, diff, emptyCapture, endRequest, getCompletion, initialProgress, isFresh, joinedWithoutCompletion, makeRequestId, observe, parse as parse$1, request, start, verifyInputs } from "./WatchBuild.mjs";
|
|
@@ -372,7 +373,8 @@ const handleConfectChange = ({ relativePath, eventTag, signal, pendingRef, resta
|
|
|
372
373
|
const entry = parse(relativePath);
|
|
373
374
|
if (Option.isSome(entry)) return isLifecycleChange ? restartEntry(entry.value) : Effect.void;
|
|
374
375
|
if (relativePath === "schema.ts") return flipDirtyAndSignal(pendingRef, signal, restart, isLifecycleChange);
|
|
375
|
-
|
|
376
|
+
const source = relativePath.split(/[/\\]/).join("/");
|
|
377
|
+
return Match.value(eventTag).pipe(Match.when("Create", () => flipDirtyAndSignal(pendingRef, signal, restart, false)), Match.whenOr("Update", "Remove", () => inputs.pipe(Effect.map((inputs) => inputs.includes(source)), Effect.orElseSucceed(() => false), Effect.flatMap((listed) => listed ? flipDirtyAndSignal(pendingRef, signal, restart, false) : Effect.void))), Match.exhaustive);
|
|
376
378
|
};
|
|
377
379
|
//#endregion
|
|
378
380
|
export { CoalesceQuiescence, OperationError, isRefreshSuccessful, make, parseFailure };
|