@genesislcap/ts-builder 14.483.3-alpha-7a2e689.0 → 14.484.0

package/dist/react-wrapper-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"react-wrapper-generator.d.ts","sourceRoot":"","sources":["../src/react-wrapper-generator.ts"],"names":[],"mappings":"AAyCA,KAAK,cAAc,GAAG;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,SAAS,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AA6gC/F,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CA+ChF"}
+{"version":3,"file":"react-wrapper-generator.d.ts","sourceRoot":"","sources":["../src/react-wrapper-generator.ts"],"names":[],"mappings":"AAyCA,KAAK,cAAc,GAAG;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,SAAS,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AA0jC/F,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAgDhF"}

package/dist/react-wrapper-generator.js

@@ -855,6 +855,16 @@ function getWorkspacePackageDirectoryByName(workspaceRoot, packageName) {
         return undefined;
     });
 }
+function enrichFromPackageDistMetadata(distDir, state) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const refState = createTypeImportState();
+        const { apiJsonFiles, dtsFiles } = yield collectTypeMetadataFiles(distDir);
+        yield parseApiJsonFiles(apiJsonFiles, refState);
+        yield parseDtsFiles(dtsFiles, refState);
+        mergeTypeImportStateInto(state, refState);
+        return refState;
+    });
+}
 function enrichFromWorkspaceWildcardExports(cwd, state) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const workspaceRoot = yield findWorkspaceRoot(cwd);
@@ -869,14 +879,8 @@ function enrichFromWorkspaceWildcardExports(cwd, state) {
             // oxlint-disable-next-line no-await-in-loop -- sequential per-package processing is intentional
             if (!(yield fileExists(distDir)))
                 continue;
-            const refState = createTypeImportState();
             // oxlint-disable-next-line no-await-in-loop -- sequential per-package processing is intentional
-            const { apiJsonFiles, dtsFiles } = yield collectTypeMetadataFiles(distDir);
-            // oxlint-disable-next-line no-await-in-loop -- sequential per-package processing is intentional
-            yield parseApiJsonFiles(apiJsonFiles, refState);
-            // oxlint-disable-next-line no-await-in-loop -- sequential per-package processing is intentional
-            yield parseDtsFiles(dtsFiles, refState);
-            mergeTypeImportStateInto(state, refState);
+            const refState = yield enrichFromPackageDistMetadata(distDir, state);
             for (const mod of refState.wildcardExportModules) {
                 if (mod.startsWith('@genesislcap/'))
                     pending.add(mod);
@@ -884,6 +888,40 @@ function enrichFromWorkspaceWildcardExports(cwd, state) {
         }
     });
 }
+/**
+ * Elements inheriting from another `@genesislcap/*` package merge that package's CEM events
+ * (see mergeFoundationInheritanceFromManifest), so their event descriptions may reference
+ * detail types exported by the superclass package. Register that package's type metadata so
+ * those identifiers resolve instead of silently degrading to `unknown`.
+ */
+function enrichFromInheritedSuperclassPackages(cwd, entries, state) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const superclassPackages = new Set(entries
+            .map((e) => { var _a; return (_a = e.declaration.superclass) === null || _a === void 0 ? void 0 : _a.package; })
+            .filter((p) => !!p && p.startsWith('@genesislcap/')));
+        if (!superclassPackages.size)
+            return;
+        const workspaceRoot = yield findWorkspaceRoot(cwd);
+        for (const packageName of superclassPackages) {
+            // Consumer repos resolve the superclass package from node_modules; inside this
+            // monorepo it is a workspace package.
+            let distDir = (0, node_path_1.resolve)(cwd, 'node_modules', packageName, 'dist');
+            // oxlint-disable-next-line no-await-in-loop -- sequential per-package processing is intentional
+            if (!(yield fileExists(distDir))) {
+                // oxlint-disable-next-line no-await-in-loop -- sequential per-package processing is intentional
+                const pkgDir = yield getWorkspacePackageDirectoryByName(workspaceRoot, packageName);
+                if (!pkgDir)
+                    continue;
+                distDir = (0, node_path_1.resolve)(pkgDir, 'dist');
+                // oxlint-disable-next-line no-await-in-loop -- sequential per-package processing is intentional
+                if (!(yield fileExists(distDir)))
+                    continue;
+            }
+            // oxlint-disable-next-line no-await-in-loop -- sequential per-package processing is intentional
+            yield enrichFromPackageDistMetadata(distDir, state);
+        }
+    });
+}
 function buildTypeImportState(cwd) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const state = createTypeImportState();
@@ -927,6 +965,7 @@ function generateReactWrappers(cwd) {
         const dtsRoot = (0, node_path_1.resolve)(cwd, 'dist/dts');
         yield (0, promises_1.mkdir)(dtsRoot, { recursive: true });
         const typeImportState = yield buildTypeImportState(cwd);
+        yield enrichFromInheritedSuperclassPackages(cwd, entries, typeImportState);
         const reactDtsPath = (0, node_path_1.resolve)(dtsRoot, 'react.d.ts');
         yield Promise.all([
             (0, promises_1.writeFile)((0, node_path_1.resolve)(cwd, 'dist/react.mjs'), generateReactWrapperJs(entries, 'esm'), 'utf8'),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/ts-builder",
   "description": "Typescript builder",
-  "version": "14.483.3-alpha-7a2e689.0",
+  "version": "14.484.0",
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@custom-elements-manifest/analyzer": "^0.8.2",
-    "@genesislcap/build-kit": "14.483.3-alpha-7a2e689.0",
+    "@genesislcap/build-kit": "14.484.0",
     "consola": "^3.0.2",
     "copyfiles": "^2.4.1",
     "pkg-types": "^1.0.2"
@@ -30,5 +30,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a42f1a2c0cea394164712c9abdeb96f58775d5e7"
+  "gitHead": "1ec7b2318e2447c2cd3ad877666b6fd1f3b87c05"
 }

package/src/react-wrapper-generator.ts

@@ -1027,6 +1027,18 @@ async function getWorkspacePackageDirectoryByName(
   return undefined;
 }
 
+async function enrichFromPackageDistMetadata(
+  distDir: string,
+  state: TypeImportState,
+): Promise<TypeImportState> {
+  const refState = createTypeImportState();
+  const { apiJsonFiles, dtsFiles } = await collectTypeMetadataFiles(distDir);
+  await parseApiJsonFiles(apiJsonFiles, refState);
+  await parseDtsFiles(dtsFiles, refState);
+  mergeTypeImportStateInto(state, refState);
+  return refState;
+}
+
 async function enrichFromWorkspaceWildcardExports(
   cwd: string,
   state: TypeImportState,
@@ -1046,14 +1058,8 @@ async function enrichFromWorkspaceWildcardExports(
     // oxlint-disable-next-line no-await-in-loop -- sequential per-package processing is intentional
     if (!(await fileExists(distDir))) continue;
 
-    const refState = createTypeImportState();
-    // oxlint-disable-next-line no-await-in-loop -- sequential per-package processing is intentional
-    const { apiJsonFiles, dtsFiles } = await collectTypeMetadataFiles(distDir);
-    // oxlint-disable-next-line no-await-in-loop -- sequential per-package processing is intentional
-    await parseApiJsonFiles(apiJsonFiles, refState);
     // oxlint-disable-next-line no-await-in-loop -- sequential per-package processing is intentional
-    await parseDtsFiles(dtsFiles, refState);
-    mergeTypeImportStateInto(state, refState);
+    const refState = await enrichFromPackageDistMetadata(distDir, state);
 
     for (const mod of refState.wildcardExportModules) {
       if (mod.startsWith('@genesislcap/')) pending.add(mod);
@@ -1061,6 +1067,45 @@ async function enrichFromWorkspaceWildcardExports(
   }
 }
 
+/**
+ * Elements inheriting from another `@genesislcap/*` package merge that package's CEM events
+ * (see mergeFoundationInheritanceFromManifest), so their event descriptions may reference
+ * detail types exported by the superclass package. Register that package's type metadata so
+ * those identifiers resolve instead of silently degrading to `unknown`.
+ */
+async function enrichFromInheritedSuperclassPackages(
+  cwd: string,
+  entries: CEMElementEntry[],
+  state: TypeImportState,
+): Promise<void> {
+  const superclassPackages = new Set(
+    entries
+      .map((e) => e.declaration.superclass?.package)
+      .filter((p): p is string => !!p && p.startsWith('@genesislcap/')),
+  );
+  if (!superclassPackages.size) return;
+
+  const workspaceRoot = await findWorkspaceRoot(cwd);
+
+  for (const packageName of superclassPackages) {
+    // Consumer repos resolve the superclass package from node_modules; inside this
+    // monorepo it is a workspace package.
+    let distDir = resolve(cwd, 'node_modules', packageName, 'dist');
+    // oxlint-disable-next-line no-await-in-loop -- sequential per-package processing is intentional
+    if (!(await fileExists(distDir))) {
+      // oxlint-disable-next-line no-await-in-loop -- sequential per-package processing is intentional
+      const pkgDir = await getWorkspacePackageDirectoryByName(workspaceRoot, packageName);
+      if (!pkgDir) continue;
+      distDir = resolve(pkgDir, 'dist');
+      // oxlint-disable-next-line no-await-in-loop -- sequential per-package processing is intentional
+      if (!(await fileExists(distDir))) continue;
+    }
+
+    // oxlint-disable-next-line no-await-in-loop -- sequential per-package processing is intentional
+    await enrichFromPackageDistMetadata(distDir, state);
+  }
+}
+
 async function buildTypeImportState(cwd: string): Promise<TypeImportState> {
   const state = createTypeImportState();
   const distDir = resolve(cwd, 'dist');
@@ -1114,6 +1159,7 @@ export async function generateReactWrappers(cwd: string): Promise<GenerateResult
   await mkdir(dtsRoot, { recursive: true });
 
   const typeImportState = await buildTypeImportState(cwd);
+  await enrichFromInheritedSuperclassPackages(cwd, entries, typeImportState);
   const reactDtsPath = resolve(dtsRoot, 'react.d.ts');
 
   await Promise.all([