fix for bundler tree-shaking

keeperapi/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@keeper-security/keeperapi",
     "description": "Keeper API Javascript SDK",
-    "version": "18.1.0",
+    "version": "18.1.1",
     "browser": "dist/browser/index.js",
     "main": "dist/index.cjs.js",
     "types": "dist/node/index.d.ts",

keeperapi/scripts/generate-proto.mjs

@@ -37,6 +37,18 @@ const FILENAME_OVERRIDES = {
     folder: 'Remove',
 }
 
+// Cross-namespace `$root.Other.Type` has no ES import — bundlers drop sibling modules.
+// Rewrite to named imports so nested types (e.g. Folder) still decode.
+function withSiblingImports(body, currentName, allNames, filenameOverrides) {
+    const siblings = allNames.filter((name) => name !== currentName && body.includes(`$root.${name}.`))
+    let rewritten = body
+    for (const name of [...siblings].sort((a, b) => b.length - a.length)) {
+        rewritten = rewritten.split(`$root.${name}.`).join(`${name}.`)
+    }
+    const imports = siblings.map((name) => `import { ${name} } from './${filenameOverrides[name] ?? name}.js';`)
+    return { rewritten, imports }
+}
+
 const run = (tool, args) =>
     new Promise((resolve, reject) => tool.main(args, (err, output) => (err ? reject(err) : resolve(output))))
 
@@ -87,6 +99,7 @@ async function main() {
 
     if (splits.length === 0) throw new Error('No namespaces found — pbjs output format may have changed')
 
+    const allNames = splits.map((s) => s.name)
     const protoDir = join(ROOT, 'src/proto')
     mkdirSync(protoDir, { recursive: true })
     for (const f of readdirSync(protoDir)) {
@@ -102,12 +115,17 @@ async function main() {
             .filter((l) => l !== 'export { $root as default };')
             .join('\n')
         const filename = FILENAME_OVERRIDES[name] ?? name
+        const { rewritten, imports } = withSiblingImports(body, name, allNames, FILENAME_OVERRIDES)
 
         writeFileSync(
             join(protoDir, `${filename}.js`),
-            [ESLINT_HEADER, `import { $protobuf, $Reader, $Writer, $util, $root } from './root.js';`, '', body].join(
-                '\n'
-            )
+            [
+                ESLINT_HEADER,
+                `import { $protobuf, $Reader, $Writer, $util, $root } from './root.js';`,
+                ...imports,
+                '',
+                rewritten,
+            ].join('\n')
         )
     }