@luckystack/devkit 0.6.0 → 0.6.2

package/CHANGELOG.md

@@ -7,6 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+Codegen fixes surfaced by a MikroORM/MongoDB consumer (verified against a real
+MikroORM project + `tsc`); consumers can drop the corresponding
+`node_modules/@luckystack/devkit/dist` patches once on this version.
+
+- **DEVKIT-1** — a route returning a MikroORM entity no longer corrupts
+  `apiTypes.generated.ts`. Symbol-keyed entity members (`[OptionalProps]`,
+  `[loadedType]`, `[selectedType]`) serialize as the invalid identifier
+  `__@<name>@<id>`; they are now dropped from the inlined type (skipped in
+  `expandTypeDetailed`, plus a brace-aware content-level safety net for the
+  cycle/depth `typeToString` fallback paths).
+- **DEVKIT-2** — `SessionLayout` used to sit on an internal whitelist that kept
+  the identifier without ever emitting its import, tripping the unresolved-type
+  validator. It now runs through normal import collection, like `AuthProps`.
+- **DEVKIT-3** — the per-route error arm lists its real fields explicitly
+  (`message?`, `errorParams?`, `httpStatus?`) alongside the `[key: string]:
+  unknown` index signature, so `res.errorParams` narrows to its type after a
+  status check instead of collapsing to `unknown`.
+- **DEVKIT-4** — a route that hands its stream emitter to a helper (no literal
+  `stream(...)` call in `main`) now infers the payload type from the declared
+  `stream: ApiStreamEmitter<T>` on `ApiParams` instead of degrading to `never`.
+- **DEVKIT-5** — private helper subtrees under a marker (`_api/_lib/*`,
+  `_sync/_lib/__tests__/*`) are skipped by route-naming validation + discovery
+  instead of being flagged as invalid route files.
+
 ## [0.1.0]
 
 ### Added

package/dist/index.js

@@ -552,6 +552,38 @@ var writeFileIfChanged = (filePath, content) => {
 var indentStr = (str, indentText) => {
   return str.split("\n").map((line, i) => i === 0 ? line : indentText + line).join("\n");
 };
+var stripSymbolKeyedMembers = (text) => {
+  if (!text.includes("__@")) return text;
+  let result = text;
+  for (; ; ) {
+    const match = /__@\w+@\d+\??\s*:/.exec(result);
+    if (!match) break;
+    const symStart = match.index;
+    const lineStart = result.lastIndexOf("\n", symStart) + 1;
+    let i = symStart + match[0].length;
+    let depth = 0;
+    let end = result.length;
+    while (i < result.length) {
+      const ch = result[i];
+      if (ch === "{" || ch === "[" || ch === "(") {
+        depth++;
+      } else if (ch === "}" || ch === "]" || ch === ")") {
+        if (depth === 0) {
+          end = i;
+          break;
+        }
+        depth--;
+      } else if (ch === ";" && depth === 0) {
+        end = i + 1;
+        break;
+      }
+      i++;
+    }
+    if (result[end] === "\n") end += 1;
+    result = result.slice(0, lineStart) + result.slice(end);
+  }
+  return result;
+};
 var validateGeneratedTypeIdentifiers = (content) => {
   const sourceFile = ts3.createSourceFile("apiTypes.generated.ts", content, ts3.ScriptTarget.Latest, true, ts3.ScriptKind.TS);
   const knownSymbols = /* @__PURE__ */ new Set();
@@ -781,7 +813,7 @@ type _ProjectApiTypeMap = {
 `;
         content += `        input: ${indentStr(entry.input, "        ")};
 `;
-        content += `        output: ${indentStr(entry.output, "        ")} | { status: 'error'; errorCode: string; [key: string]: unknown };
+        content += `        output: ${indentStr(entry.output, "        ")} | { status: 'error'; errorCode: string; message?: string; errorParams?: { key: string; value: string | number | boolean }[]; httpStatus?: number; [key: string]: unknown };
 `;
         content += `        stream: ${indentStr(entry.stream, "        ")};
 `;
@@ -936,9 +968,9 @@ type _ProjectSyncTypeMap = {
 `;
         content += `        clientInput: ${indentStr(entry.clientInput, "        ")};
 `;
-        content += `        serverOutput: ${indentStr(entry.serverOutput, "        ")} | { status: 'error'; errorCode: string; [key: string]: unknown };
+        content += `        serverOutput: ${indentStr(entry.serverOutput, "        ")} | { status: 'error'; errorCode: string; message?: string; errorParams?: { key: string; value: string | number | boolean }[]; [key: string]: unknown };
 `;
-        content += `        clientOutput: ${indentStr(entry.clientOutput, "        ")} | { status: 'error'; errorCode: string; [key: string]: unknown };
+        content += `        clientOutput: ${indentStr(entry.clientOutput, "        ")} | { status: 'error'; errorCode: string; message?: string; errorParams?: { key: string; value: string | number | boolean }[]; [key: string]: unknown };
 `;
         content += `        serverStream: ${indentStr(entry.serverStream, "        ")};
 `;
@@ -980,6 +1012,7 @@ declare module '@luckystack/core/typemap' {
 	interface SyncTypeMap extends _ProjectSyncTypeMap {}
 }
 `;
+  content = stripSymbolKeyedMembers(content);
   validateGeneratedTypeIdentifiers(content);
   const schemasContent = buildSchemasContent({ typesByPage });
   const fallbacks = collectFallbacks(typesByPage, syncTypesByPage);
@@ -1309,6 +1342,7 @@ var expandTypeDetailed = (type, checker, depth = 0, state) => {
         const fields = [];
         let unresolvedSymbols = [];
         for (const prop of props) {
+          if (prop.getName().startsWith("__@")) continue;
           const propType = checker.getTypeOfSymbol(prop);
           const literalType = getLiteralTypeFromPropertySymbol(prop, checker, depth + 1);
           const isOptional = (prop.flags & ts4.SymbolFlags.Optional) !== 0;
@@ -1543,6 +1577,37 @@ var getInputTypeDetailsFromFile = (filePath) => {
     return { text: DEFAULT, unresolvedSymbols: [] };
   }
 };
+var STREAM_EMITTER_TYPE_NAMES = /* @__PURE__ */ new Set([
+  "ApiStreamEmitter",
+  "SyncServerStreamEmitter",
+  "SyncClientStreamEmitter",
+  "SyncBroadcastStreamEmitter",
+  "SyncStreamToEmitter"
+]);
+var extractDeclaredStreamTypeFromApiParams = (sourceFile, checker) => {
+  let result = null;
+  const visit = (node) => {
+    if (result) return;
+    if (ts5.isInterfaceDeclaration(node) && node.name.text.endsWith("Params")) {
+      for (const member of node.members) {
+        if (ts5.isPropertySignature(member) && ts5.isIdentifier(member.name) && member.name.text === "stream" && member.type && ts5.isTypeReferenceNode(member.type) && ts5.isIdentifier(member.type.typeName) && STREAM_EMITTER_TYPE_NAMES.has(member.type.typeName.text)) {
+          const typeArg = member.type.typeArguments?.[0];
+          if (typeArg) {
+            const argType = checker.getNonNullableType(checker.getTypeFromTypeNode(typeArg));
+            const expanded = expandTypeDetailed(argType, checker);
+            if (expanded.text.trim().length > 0) {
+              result = { text: expanded.text, unresolvedSymbols: expanded.unresolvedSymbols };
+              return;
+            }
+          }
+        }
+      }
+    }
+    ts5.forEachChild(node, visit);
+  };
+  visit(sourceFile);
+  return result;
+};
 var getApiStreamPayloadTypeDetailsFromFile = (filePath) => {
   const DEFAULT = "never";
   try {
@@ -1553,7 +1618,10 @@ var getApiStreamPayloadTypeDetailsFromFile = (filePath) => {
     const mainFn = findMainFunction(sourceFile);
     if (!mainFn) return { text: DEFAULT, unresolvedSymbols: [] };
     const details = collectStreamCallPayloadTypeDetails(mainFn, checker);
-    return { text: details.text || DEFAULT, unresolvedSymbols: details.unresolvedSymbols };
+    if (details.text !== "") return details;
+    const declared = extractDeclaredStreamTypeFromApiParams(sourceFile, checker);
+    if (declared) return declared;
+    return { text: DEFAULT, unresolvedSymbols: [] };
   } catch (error) {
     console.error(`[TypeMapGenerator] Error extracting API stream payload type from ${filePath}:`, error);
     return { text: DEFAULT, unresolvedSymbols: [] };
@@ -1732,8 +1800,7 @@ var sanitizeTypeAndCollectImports = ({
   const { namedImports, defaultImports } = collectors;
   return type.replaceAll(/\b([A-Z][a-zA-Z0-9_]*)(<[^>]+>)?(\[\])?\b/g, (match, typeName, _generics, isArray) => {
     const builtins = ["Promise", "Date", "Function", "Array", "Record", "Partial", "Pick", "Omit", "Error", "Map", "Set", "Buffer", "Uint8Array", "Object"];
-    const existingImports = ["SessionLayout"];
-    if (builtins.includes(typeName) || existingImports.includes(typeName) || knownGenerics.has(typeName)) {
+    if (builtins.includes(typeName) || knownGenerics.has(typeName)) {
       return match;
     }
     const importConfig = fileImports.get(typeName);
@@ -2159,6 +2226,13 @@ var normalizePath = (value) => {
   return value.replaceAll("\\", "/");
 };
 var toRel = (absolute) => path8.relative(ROOT_DIR3, absolute).replaceAll("\\", "/");
+var isInsidePrivateRouteSubfolder = (fullPath) => {
+  const { privateFolderPrefix, apiMarker, syncMarker } = getRoutingRules();
+  const segments = normalizePath(fullPath).split("/");
+  const markerIndex = segments.findIndex((segment) => segment === apiMarker || segment === syncMarker);
+  if (markerIndex === -1) return false;
+  return segments.slice(markerIndex + 1).some((segment) => segment.startsWith(privateFolderPrefix));
+};
 var walkRouteFiles = (dir, results = []) => {
   const entries = fs5.readdirSync(dir, { withFileTypes: true });
   const apiSeg = apiMarkerSegment();
@@ -2168,6 +2242,7 @@ var walkRouteFiles = (dir, results = []) => {
     const fullPath = path8.join(dir, entry.name);
     const normalizedFullPath = normalizePath(fullPath);
     if (ignore(toRel(fullPath))) continue;
+    if (isInsidePrivateRouteSubfolder(fullPath)) continue;
     if (entry.isDirectory()) {
       if (entry.name.startsWith(".") || entry.name === "node_modules") {
         continue;