Published using @Stream44 Studio

Signed-off-by: Christoph <christoph@christoph.diy>

Author: cadorn

caps/WorkspaceCli.ts

@@ -93,7 +93,7 @@ export async function capsule({
                         const config = await this.WorkspaceConfig.config as any
 
                         const api: Record<string, any> = {}
-                        for (const propertyName in config.javascript.api) {
+                        for (const propertyName in config?.javascript?.api) {
                             api[propertyName] = config.javascript.api[propertyName]
                         }
                         return api
@@ -107,7 +107,7 @@ export async function capsule({
                         const self = this
 
                         const commands: Record<string, (commandArgs?: any) => Promise<void>> = {}
-                        for (const commandName in cliConfig.cli.commands) {
+                        for (const commandName in cliConfig?.cli?.commands) {
                             const commandConfig = cliConfig.cli.commands[commandName]
 
                             commands[commandName] = async function (commandArgs?: any) {
@@ -355,7 +355,7 @@ export async function capsule({
                         const cliConfig = await this.$config.config
                         const cliCommands = await this.cliCommands as Record<string, (args?: any) => Promise<void>>
 
-                        for (const commandName in cliConfig.cli.commands) {
+                        for (const commandName in cliConfig?.cli?.commands) {
                             const commandConfig = cliConfig.cli.commands[commandName]
                             const { description, arguments: commandArgs } = commandConfig
 

caps/WorkspaceConfig.yaml

@@ -1,4 +1,4 @@
-$schema: ../../../../.~o/workspace.foundation/@t44.sh~t44~caps~JsonSchemas/@t44.sh~t44~structs~WorkspaceConfigFile.json
+$schema: ../../../../../../../.~o/workspace.foundation/@t44.sh~t44~caps~JsonSchemas/@t44.sh~t44~structs~WorkspaceConfigFile.json
 extends:
   - ./WorkspaceShell.yaml
 '#t44/structs/WorkspaceCliConfig':

caps/WorkspaceConfigFile.ts

@@ -2,7 +2,6 @@
 import * as yaml from 'js-yaml'
 import { readFile, writeFile, access } from 'fs/promises';
 import { join, resolve, relative, dirname } from 'path'
-import { createRequire } from 'module'
 import chalk from 'chalk'
 
 export async function capsule({
@@ -220,7 +219,7 @@ export async function capsule({
 }
 capsule['#'] = 't44/caps/WorkspaceConfigFile'
 
-function resolveExtendPath(extendPath: string, configDir: string, workspaceRequire: NodeRequire): string {
+function resolveExtendPath(extendPath: string, configDir: string): string {
     if (extendPath.startsWith('.')) {
         return resolve(configDir, extendPath)
     } else {
@@ -243,9 +242,21 @@ function resolveExtendPath(extendPath: string, configDir: string, workspaceRequi
             filePath = parts.slice(1).join('/')
         }
 
-        // Resolve the package's package.json to get its directory
-        const packageJsonPath = workspaceRequire.resolve(`${packageName}/package.json`)
-        const packageDir = join(packageJsonPath, '..')
+        // Walk up from configDir looking for node_modules/<packageName>
+        const { existsSync } = require('fs')
+        let searchDir = configDir
+        let packageDir = ''
+        while (searchDir !== dirname(searchDir)) {
+            const candidate = join(searchDir, 'node_modules', packageName)
+            if (existsSync(join(candidate, 'package.json'))) {
+                packageDir = candidate
+                break
+            }
+            searchDir = dirname(searchDir)
+        }
+        if (!packageDir) {
+            throw new Error(`Cannot resolve package '${packageName}' from '${configDir}'. Ensure it is installed in node_modules.`)
+        }
 
         // Resolve the file path within the package
         return resolve(packageDir, filePath)
@@ -257,9 +268,6 @@ async function loadConfigWithExtends(configPath: string, workspaceRootDir: strin
     const mainConfigDir = join(resolve(configPath), '..')
     let configTree: any = null
 
-    // Create a require function relative to workspace root for module resolution
-    const workspaceRequire = createRequire(join(workspaceRootDir, 'package.json'))
-
     async function loadConfigRecursive(currentPath: string, referencedFrom?: string, chain: string[] = []): Promise<any> {
         const absolutePath = resolve(currentPath)
 
@@ -484,7 +492,7 @@ async function loadConfigWithExtends(configPath: string, workspaceRootDir: strin
         if (config.extends && Array.isArray(config.extends)) {
             for (const extendPath of config.extends) {
                 // Always use configDir for resolution - it's the directory of the file containing the extends
-                const resolvedExtendPath = resolveExtendPath(extendPath, configDir, workspaceRequire)
+                const resolvedExtendPath = resolveExtendPath(extendPath, configDir)
                 const childNode = await loadConfigRecursive(resolvedExtendPath, absolutePath, currentChain)
                 // Store the original extends value for display
                 childNode.extendsValue = extendPath

caps/WorkspaceShell.yaml

@@ -1,4 +1,4 @@
-$schema: ../../../../.~o/workspace.foundation/@t44.sh~t44~caps~JsonSchemas/@t44.sh~t44~structs~WorkspaceConfigFile.json
+$schema: ../../../../../../../.~o/workspace.foundation/@t44.sh~t44~caps~JsonSchemas/@t44.sh~t44~structs~WorkspaceConfigFile.json
 '#t44/structs/WorkspaceShellConfig':
   env:
     default: null

lib/key.ts

@@ -272,6 +272,10 @@ export async function generateEd25519Key(
     comment: string
 ): Promise<{ publicKey: string; keyFingerprint: string } | null> {
     const chalk = (await import('chalk')).default
+    const { mkdir } = await import('fs/promises')
+    const { dirname } = await import('path')
+
+    await mkdir(dirname(privateKeyPath), { recursive: true })
 
     try {
         execSync(

package.json

@@ -1,6 +1,6 @@
 {
     "name": "t44",
-    "version": "0.4.0-rc.7",
+    "version": "0.4.0-rc.8",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -85,9 +85,9 @@
         "@ucanto/principal": "^9.0.3",
         "@ucanto/server": "^11.0.3",
         "json-schema-ref-resolver": "^3.0.0",
-        "@stream44.studio/encapsulate": "^0.4.0-rc.8",
-        "@stream44.studio/dco": "^0.3.0-rc.8",
-        "@stream44.studio/t44-blockchaincommons.com": "^0.1.0-rc.9"
+        "@stream44.studio/encapsulate": "^0.4.0-rc.9",
+        "@stream44.studio/dco": "^0.3.0-rc.9",
+        "@stream44.studio/t44-blockchaincommons.com": "^0.1.0-rc.10"
     },
     "devDependencies": {
         "@types/bun": "^1.3.4",

workspace.yaml

@@ -1,3 +1,3 @@
-$schema: ../../../.~o/workspace.foundation/@t44.sh~t44~caps~JsonSchemas/@t44.sh~t44~structs~WorkspaceConfigFile.json
+$schema: ../../../../../../.~o/workspace.foundation/@t44.sh~t44~caps~JsonSchemas/@t44.sh~t44~structs~WorkspaceConfigFile.json
 extends:
   - ./caps/WorkspaceConfig.yaml