fix: keep fn generator aligned with SMS function output

Author: Zetazzz

packages/fn-generator/src/builders/package.ts

@@ -8,7 +8,7 @@ import type { FunctionInfo, Manifest } from '../types';
  * Build all manifests for a single function:
  *   - per-template files (placeholders applied, package.json/tsconfig.json processed)
  *   - shared template files (same processing)
- *   - symlinks for handler.{ts,py}, *.d.ts, and any other *.py
+ *   - symlinks for handler.{ts,py} and supporting TypeScript/Python sources
  *
  * `templateDir` is the resolved type-specific dir (`templates/node-graphql/` etc.).
  */
@@ -56,17 +56,40 @@ export const buildPackageManifests = (
     out.push({ kind: 'symlink', path: path.join(args.genDir, 'handler.py'), target: handlerPy });
   }
 
-  // 4. Auxiliary symlinks: all *.d.ts and *.py (except handler.py already linked above)
-  const files = fs.readdirSync(args.fnDir);
-  for (const file of files) {
-    if (file.endsWith('.d.ts') || (file.endsWith('.py') && file !== 'handler.py')) {
+  // 4. Supporting source symlinks. Richer functions may split implementation
+  // across nested TypeScript/Python files; mirror scripts/generate.ts exactly.
+  const addSupportSymlinks = (base = ''): void => {
+    const entries = fs.readdirSync(path.join(args.fnDir, base));
+    for (const entry of entries) {
+      if (entry === '__tests__') continue;
+
+      const relPath = path.join(base, entry);
+      const sourcePath = path.join(args.fnDir, relPath);
+      const stat = fs.statSync(sourcePath);
+
+      if (stat.isDirectory()) {
+        addSupportSymlinks(relPath);
+        continue;
+      }
+
+      if (
+        relPath === 'handler.ts' ||
+        relPath === 'handler.py' ||
+        !(/\.(ts|d\.ts|py)$/.test(entry)) ||
+        entry.endsWith('.test.ts')
+      ) {
+        continue;
+      }
+
       out.push({
         kind: 'symlink',
-        path: path.join(args.genDir, file),
-        target: path.join(args.fnDir, file),
+        path: path.join(args.genDir, relPath),
+        target: sourcePath,
       });
     }
-  }
+  };
+
+  addSupportSymlinks();
 
   return out;
 };

packages/fn-generator/src/discovery.ts

@@ -52,7 +52,9 @@ export const assignAndValidatePorts = (
   const usedPorts = new Set<number>(
     manifests.filter((m) => m.port).map((m) => m.port as number)
   );
-  let nextPort = usedPorts.size > 0 ? Math.max(...usedPorts) + 1 : 8081;
+  // Fill the lowest available local function port first. Explicit high ports
+  // must not shift existing functions that rely on automatic assignment.
+  let nextPort = 8081;
   for (const m of manifests) {
     if (!m.port) {
       while (usedPorts.has(nextPort)) nextPort++;