@feasibleone/blong-gogo 1.11.2 → 1.12.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [1.12.1](https://github.com/feasibleone/blong/compare/blong-gogo-v1.12.0...blong-gogo-v1.12.1) (2026-03-15)
+
+
+### Bug Fixes
+
+* build ([3d35ac3](https://github.com/feasibleone/blong/commit/3d35ac3058279a941eeacbc02888bf5cd74ce93a))
+
+## [1.12.0](https://github.com/feasibleone/blong/compare/blong-gogo-v1.11.2...blong-gogo-v1.12.0) (2026-03-15)
+
+
+### Features
+
+* improve api loading ([2008fa3](https://github.com/feasibleone/blong/commit/2008fa38272252682f259e22632f10e8c33d64f5))
+
+
+### Bug Fixes
+
+* imports ([c179b6d](https://github.com/feasibleone/blong/commit/c179b6d2d0709f548560e13a99dc2e62facad645))
+
 ## [1.11.2](https://github.com/feasibleone/blong/compare/blong-gogo-v1.11.1...blong-gogo-v1.11.2) (2026-03-15)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feasibleone/blong-gogo",
-  "version": "1.11.2",
+  "version": "1.12.1",
   "repository": {
     "url": "git+https://github.com/feasibleone/blong.git"
   },

package/src/ApiSchema.ts

@@ -4,13 +4,15 @@ import type {
     ILog,
     PathItemObject,
     SchemaObject,
-} from '@feasibleone/blong';
-import {Internal} from '@feasibleone/blong';
+} from '@feasibleone/blong/types';
+import {Internal} from '@feasibleone/blong/types';
 import {createReadStream, statSync, writeFileSync, type Dirent} from 'node:fs';
-import path, {basename, extname} from 'node:path';
+import path, {basename, dirname, extname} from 'node:path';
 
+import {join} from 'path';
 import {identifier} from './lib.ts';
 import loadApi from './loadApi.ts';
+import scan from './scan.ts';
 
 interface IConfig {
     logLevel?: Parameters<ILog['logger']>[0];
@@ -24,6 +26,7 @@ export default class ApiSchema extends Internal implements IApiSchema {
     };
 
     #loaded: Record<string, GatewaySchema> = {};
+    #namespace: Record<string, Record<string, GatewaySchema>> = {};
     #generateFile: Set<string> = new Set();
     #generateDir: Record<
         string,
@@ -43,16 +46,46 @@ export default class ApiSchema extends Internal implements IApiSchema {
     }
 
     public async schema(
-        def: {
-            namespace: Record<string, string | string[]>;
+        {
+            namespace,
+            url,
+        }: {
+            namespace?: Record<string, string | string[]> | string[];
+            url?: string;
         },
         source: string,
     ): Promise<Record<string, GatewaySchema>> {
         const result: Record<string, GatewaySchema> = {};
+        if (url) {
+            const dir = dirname(url.startsWith('file://') ? url.slice(7) : url);
+            const files = await scan(dir);
+            namespace = namespace || {};
+            for (const file of files) {
+                if (
+                    file.isFile() &&
+                    (file.name.endsWith('.yaml') ||
+                        file.name.endsWith('.yml') ||
+                        file.name.endsWith('.json'))
+                ) {
+                    const [name] = basename(file.name).split('.');
+                    namespace[name] ||= [];
+                    namespace[name].push(join(dir, file.name));
+                }
+            }
+        }
+        if (Array.isArray(namespace))
+            return namespace.reduce(
+                (acc, name) => ({
+                    ...acc,
+                    ...this.#namespace[name],
+                }),
+                {},
+            );
 
-        for (const [name, locations] of Object.entries(def.namespace)) {
+        for (const [name, locations] of Object.entries(namespace)) {
             const bundle = await loadApi(locations, source);
             const {namespace = name, destination} = bundle['x-blong'] ?? {};
+            this.#namespace[namespace] ||= {};
             Object.entries(bundle.paths).forEach(([path, methods]: [string, PathItemObject]) => {
                 ['get', 'post', 'put', 'delete'].forEach(
                     (httpMethod: 'get' | 'post' | 'put' | 'delete') => {
@@ -62,9 +95,7 @@ export default class ApiSchema extends Internal implements IApiSchema {
                             operation.parameters as {in?: string; schema: unknown}[]
                         )?.find?.(param => param?.in === 'body')?.schema;
                         const method = this.method(operation);
-                        this.#loaded[`${namespace}${method}`.toLowerCase()] = result[
-                            `${namespace}.${method}`.toLowerCase()
-                        ] = {
+                        const definition: GatewaySchema = {
                             rpc: false,
                             auth: false,
                             ...(bodyParam && {
@@ -88,6 +119,10 @@ export default class ApiSchema extends Internal implements IApiSchema {
                             operation,
                             path: path.replaceAll('{', ':').replaceAll('}', ''),
                         };
+                        this.#loaded[`${namespace}${method}`.toLowerCase()] = definition;
+                        this.#namespace[namespace][`${namespace}.${method}`.toLowerCase()] =
+                            definition;
+                        result[`${namespace}.${method}`.toLowerCase()] = definition;
                     },
                 );
             });
@@ -110,7 +145,7 @@ export default class ApiSchema extends Internal implements IApiSchema {
                 writeFileSync(
                     filename,
                     `import unchanged from '@feasibleone/blong';
-import {type IMeta, handler} from '@feasibleone/blong';
+import {type IMeta, handler} from '@feasibleone/blong/types';
 
 // #region API
 type Handler = (params: {

package/src/ErrorFactory.ts

@@ -1,5 +1,5 @@
-import type {IErrorFactory, ILog, IMeta, ITypedError} from '@feasibleone/blong';
-import {Internal} from '@feasibleone/blong';
+import type {IErrorFactory, ILog, IMeta, ITypedError} from '@feasibleone/blong/types';
+import {Internal} from '@feasibleone/blong/types';
 
 import Errors from './error.ts';
 

package/src/Gateway.ts

@@ -8,8 +8,8 @@ import type {
     ILocal,
     ILog,
     IMeta,
-} from '@feasibleone/blong';
-import {Internal} from '@feasibleone/blong';
+} from '@feasibleone/blong/types';
+import {Internal} from '@feasibleone/blong/types';
 import fastify, {type FastifyRequest, type RouteOptions} from 'fastify';
 import os from 'os';
 import type {LevelWithSilent} from 'pino';

package/src/GatewayClient.ts

@@ -1,4 +1,4 @@
-import type {Errors, IErrorFactory, IErrorMap, ILocal, ILog, IMeta} from '@feasibleone/blong';
+import type {Errors, IErrorFactory, IErrorMap, ILocal, ILog, IMeta} from '@feasibleone/blong/types';
 import ky from 'ky';
 import {spare} from 'ut-function.timing';
 

package/src/GatewayCodec.ts

@@ -1,4 +1,4 @@
-import type {IMeta} from '@feasibleone/blong';
+import type {IMeta} from '@feasibleone/blong/types';
 import got, {type HTTPAlias, type Headers} from 'got';
 import type {JWTPayload} from 'jose';
 import busGateway from 'ut-bus/gateway.js';

package/src/Local.ts

@@ -1,4 +1,4 @@
-import {type ILocal, Internal} from '@feasibleone/blong';
+import {type ILocal, Internal} from '@feasibleone/blong/types';
 
 export default class Local extends Internal implements ILocal {
     #mapLocal: object = {};

package/src/Log.ts

@@ -1,4 +1,4 @@
-import {Internal, type ILog} from '@feasibleone/blong';
+import {Internal, type ILog} from '@feasibleone/blong/types';
 import {pino, type Logger, type LoggerOptions} from 'pino';
 
 // echo -e "\u001B]8;;https://google.com\u001B\\Кликни тук\u001B]8;;\e\\"

package/src/Port.ts

@@ -1,4 +1,4 @@
-import {Internal, type IAdapterFactory} from '@feasibleone/blong';
+import {Internal, type IAdapterFactory} from '@feasibleone/blong/types';
 import {Port as UtPort} from 'ut-port';
 
 export interface IPort {

package/src/Realm.ts

@@ -1,4 +1,4 @@
-import type {IAdapterFactory, ILog, IRegistry} from '@feasibleone/blong';
+import type {IAdapterFactory, ILog, IRegistry} from '@feasibleone/blong/types';
 
 export interface IRealm {
     addModule: (name: string | symbol, mod: IRegistry) => void;
@@ -21,7 +21,7 @@ export default class RealmImpl implements IRealm {
             name: string;
             pkg: {name: string; version: string};
         },
-        {log, registry}: {log?: ILog; registry?: IRegistry}
+        {log, registry}: {log?: ILog; registry?: IRegistry},
     ) {
         this.#config = config;
         this.#registry = registry;

package/src/Registry.ts

@@ -10,8 +10,8 @@ import type {
     IRegistry,
     IRemote,
     IRpcServer,
-} from '@feasibleone/blong';
-import {Internal} from '@feasibleone/blong';
+} from '@feasibleone/blong/types';
+import {Internal} from '@feasibleone/blong/types';
 import PQueue from 'p-queue';
 import {Type} from 'typebox';
 import {monotonicFactory} from 'ulidx';

package/src/Remote.ts

@@ -8,8 +8,8 @@ import type {
     IRemote,
     ITypedError,
     RemoteMethod,
-} from '@feasibleone/blong';
-import {Internal} from '@feasibleone/blong';
+} from '@feasibleone/blong/types';
+import {Internal} from '@feasibleone/blong/types';
 import hrtime from 'browser-process-hrtime';
 
 const errorMap: IErrorMap = {

package/src/ResolutionDiscovery.ts

@@ -1,4 +1,4 @@
-import {Internal, type Errors, type IErrorFactory, type IErrorMap} from '@feasibleone/blong';
+import {Internal, type Errors, type IErrorFactory, type IErrorMap} from '@feasibleone/blong/types';
 import hrtime from 'browser-process-hrtime';
 import {hostname} from 'os';
 import multicastResolver from 'ut-bus/resolver.ts';

package/src/ResolutionLocal.ts

@@ -1,4 +1,4 @@
-import {Internal} from '@feasibleone/blong';
+import {Internal} from '@feasibleone/blong/types';
 
 import type {IResolution} from './Resolution.ts';
 

package/src/RpcClient.ts

@@ -6,7 +6,7 @@ import type {
     ILog,
     IMeta,
     IRemote,
-} from '@feasibleone/blong';
+} from '@feasibleone/blong/types';
 import got, {type HttpsOptions} from 'got';
 import timing from 'ut-function.timing';
 

package/src/RpcServer.ts

@@ -1,5 +1,5 @@
 // import { DaprServer, CommunicationProtocolEnum } from '@dapr/dapr';
-import {Internal, type ILog, type IRpcServer} from '@feasibleone/blong';
+import {Internal, type ILog, type IRpcServer} from '@feasibleone/blong/types';
 import fastify, {type FastifyReply, type FastifyRequest, type RouteOptions} from 'fastify';
 
 import type {IResolution} from './Resolution.ts';

package/src/Watch.ts

@@ -7,7 +7,7 @@ import {
     type IModuleConfig,
     type IRegistry,
     type IRemote,
-} from '@feasibleone/blong';
+} from '@feasibleone/blong/types';
 import {Formatter, TypeScriptToTypeBox} from '@sinclair/typebox-codegen';
 import chokidar, {type FSWatcher} from 'chokidar';
 import type {Dirent} from 'fs';

package/src/adapter/browser/http.ts

@@ -1,5 +1,5 @@
-import type {Errors, IErrorMap, IMeta} from '@feasibleone/blong';
-import {adapter} from '@feasibleone/blong';
+import type {Errors, IErrorMap, IMeta} from '@feasibleone/blong/types';
+import {adapter} from '@feasibleone/blong/types';
 import got, {type HttpsOptions, type Options} from 'got';
 
 import tls from '../../tls.ts';

package/src/adapter/browser.ts

@@ -1,4 +1,4 @@
-import {realm} from '@feasibleone/blong';
+import {realm} from '@feasibleone/blong/types';
 
 export default realm(blong => ({
     url: import.meta.url,

package/src/adapter/server/github.ts

@@ -1,4 +1,4 @@
-import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong';
+import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong/types';
 import {Octokit} from '@octokit/rest';
 
 export interface IConfig {

package/src/adapter/server/http.ts

@@ -1,5 +1,5 @@
-import type {IMeta} from '@feasibleone/blong';
-import {adapter, type Errors, type IErrorMap} from '@feasibleone/blong';
+import type {IMeta} from '@feasibleone/blong/types';
+import {adapter, type Errors, type IErrorMap} from '@feasibleone/blong/types';
 import got, {type HttpsOptions, type Options} from 'got';
 
 import tls from '../../tls.ts';

package/src/adapter/server/k8s.ts

@@ -1,4 +1,4 @@
-import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong';
+import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong/types';
 import * as k8s from '@kubernetes/client-node';
 
 export interface IConfig {

package/src/adapter/server/kafka.ts

@@ -1,4 +1,4 @@
-import {adapter} from '@feasibleone/blong';
+import {adapter} from '@feasibleone/blong/types';
 import Kafka from 'node-rdkafka';
 import {Duplex} from 'stream';
 

package/src/adapter/server/keycloak.ts

@@ -1,4 +1,4 @@
-import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong';
+import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong/types';
 import KcAdminClient from '@keycloak/keycloak-admin-client';
 import got from 'got';
 

package/src/adapter/server/knex.ts

@@ -1,4 +1,4 @@
-import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong';
+import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong/types';
 import Knex from 'knex';
 
 export interface IConfig {

package/src/adapter/server/mongodb.ts

@@ -1,4 +1,4 @@
-import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong';
+import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong/types';
 import mongoUriBuilder from 'mongo-uri-builder';
 import {MongoClient, type Sort} from 'mongodb';
 

package/src/adapter/server/s3.ts

@@ -7,7 +7,7 @@ import {
     PutObjectCommand,
     S3Client,
 } from '@aws-sdk/client-s3';
-import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong';
+import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong/types';
 import {createReadStream, statSync} from 'fs';
 import {Readable} from 'stream';
 

package/src/adapter/server/slack.ts

@@ -1,4 +1,4 @@
-import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong';
+import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong/types';
 import {IncomingWebhook} from '@slack/webhook';
 
 export interface IConfig {

package/src/adapter/server/tcp.ts

@@ -1,4 +1,4 @@
-import {adapter, type ITypedError} from '@feasibleone/blong';
+import {adapter, type ITypedError} from '@feasibleone/blong/types';
 import {Socket} from 'net';
 import createReconnect from 'reconnect-core';
 import bitSyntax from 'ut-bitsyntax';

package/src/adapter/server/vault.ts

@@ -1,4 +1,4 @@
-import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong';
+import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong/types';
 import vault from 'node-vault';
 
 export interface IConfig {

package/src/adapter/server/webhook.ts

@@ -1,4 +1,4 @@
-import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong';
+import {adapter, type Errors, type IErrorMap, type IMeta} from '@feasibleone/blong/types';
 import got, {type HttpsOptions, type Options} from 'got';
 import {Duplex, Readable, Writable} from 'stream';
 

package/src/adapter/server.ts

@@ -1,4 +1,4 @@
-import {realm} from '@feasibleone/blong';
+import {realm} from '@feasibleone/blong/types';
 
 export default realm(blong => ({
     url: import.meta.url,

package/src/adapter.ts

@@ -6,7 +6,7 @@ import type {
     IErrorMap,
     IMeta,
     ITypedError,
-} from '@feasibleone/blong';
+} from '@feasibleone/blong/types';
 import type net from 'node:net';
 import PQueue from 'p-queue';
 import merge from 'ut-function.merge';

package/src/codec/adapter/jsonrpc/errors.ts

@@ -1,4 +1,4 @@
-import {library} from '@feasibleone/blong';
+import {library} from '@feasibleone/blong/types';
 
 export default library(({lib: {error}}) => ({
     errors: error({

package/src/codec/adapter/jsonrpc/receive.ts

@@ -1,4 +1,4 @@
-import {handler, type ITypedError} from '@feasibleone/blong';
+import {handler, type ITypedError} from '@feasibleone/blong/types';
 import {type Response} from 'got';
 
 export default handler(({errors}) => ({

package/src/codec/adapter/jsonrpc/send.ts

@@ -1,4 +1,4 @@
-import {handler, type IMeta} from '@feasibleone/blong';
+import {handler, type IMeta} from '@feasibleone/blong/types';
 import timing from 'ut-function.timing';
 
 export default handler(({config}) => {
@@ -7,7 +7,7 @@ export default handler(({config}) => {
         send(
             msg: {$http: {method?: string; headers?: unknown; path?: unknown}},
             $meta: IMeta,
-            context: unknown
+            context: unknown,
         ) {
             const params = (msg && !(msg instanceof Array) && Object.assign({}, msg)) || msg;
             const $http = params?.$http;

package/src/codec/adapter/mle/ready.ts

@@ -1,4 +1,4 @@
-import {handler} from '@feasibleone/blong';
+import {handler} from '@feasibleone/blong/types';
 import {type Response} from 'got';
 import {exportJWK, generateKeyPair} from 'jose';
 import joseFactory from 'ut-bus/jose.js';

package/src/codec/adapter/openapi/errors.ts

@@ -1,4 +1,4 @@
-import {library} from '@feasibleone/blong';
+import {library} from '@feasibleone/blong/types';
 
 export default library(({lib: {error}}) => {
     error({

package/src/codec/adapter/openapi/load.ts

@@ -1,4 +1,4 @@
-import {library} from '@feasibleone/blong';
+import {library} from '@feasibleone/blong/types';
 
 import loadApi from '../../../loadApi.ts';
 

package/src/codec/adapter/openapi/ready.ts

@@ -1,4 +1,4 @@
-import {handler, type IMeta} from '@feasibleone/blong';
+import {handler, type IMeta} from '@feasibleone/blong/types';
 
 import {methodId} from '../../../lib.ts';
 

package/src/codec/adapter/openapi/request.ts

@@ -1,4 +1,4 @@
-import {library} from '@feasibleone/blong';
+import {library} from '@feasibleone/blong/types';
 import {type OpenAPIV2} from 'openapi-types';
 import interpolate from 'ut-function.interpolate';
 

package/src/codec/browser.ts

@@ -1,4 +1,4 @@
-import {realm} from '@feasibleone/blong';
+import {realm} from '@feasibleone/blong/types';
 
 export default realm(blong => ({
     url: import.meta.url,

package/src/codec/server.ts

@@ -1,4 +1,4 @@
-import {realm} from '@feasibleone/blong';
+import {realm} from '@feasibleone/blong/types';
 
 export default realm(blong => ({
     url: import.meta.url,

package/src/codec/test/test/testCodecMle.ts

@@ -1,4 +1,4 @@
-import {handler, type IMeta} from '@feasibleone/blong';
+import {handler, type IMeta} from '@feasibleone/blong/types';
 import type Assert from 'node:assert';
 
 const DAY = 24 * 60 * 60 * 1000;

package/src/codec/test/test/testLoginTokenCreate.ts

@@ -1,4 +1,4 @@
-import {handler, type IMeta} from '@feasibleone/blong';
+import {handler, type IMeta} from '@feasibleone/blong/types';
 
 export default handler(({lib: {group}, handler: {loginTokenCreate}}) => ({
     testLoginTokenCreate: ({name = 'login token'}: {name?: string}) =>

package/src/error.ts

@@ -1,4 +1,4 @@
-import type {IErrorFactory, IMeta, ITypedError} from '@feasibleone/blong';
+import type {IErrorFactory, IMeta, ITypedError} from '@feasibleone/blong/types';
 
 const typeRegex: RegExp = /^[$a-z]\w*(\.!?\w+)*$/;
 const paramsRegex: RegExp = /\{([^}]*)\}/g;

package/src/handler.name.test.ts

@@ -2,45 +2,57 @@
  * Test to verify that handlers get unique names matching their filenames
  */
 
-import {describe, it} from 'node:test';
+import {handler} from '@feasibleone/blong/types';
 import assert from 'node:assert';
-import {handler} from '@feasibleone/blong';
+import {describe, it} from 'node:test';
 
 describe('Handler naming', () => {
     it('should preserve explicit handler names when they match expected name', () => {
         const namedHandler = handler(function myHandler({config}) {
             return {send() {}};
         });
-        
-        assert.strictEqual((namedHandler as Function).name, 'myHandler', 'Named handler should preserve its name');
+
+        assert.strictEqual(
+            (namedHandler as Function).name,
+            'myHandler',
+            'Named handler should preserve its name',
+        );
     });
 
     it('should allow setting name on anonymous handlers', () => {
         const anonymousHandler = handler(({config}) => {
             return {send() {}};
         });
-        
+
         // Simulate what Watch.ts does when loading handlers
         Object.defineProperty(anonymousHandler, 'name', {
             value: 'send',
             configurable: true,
             enumerable: false,
         });
-        
-        assert.strictEqual((anonymousHandler as Function).name, 'send', 'Handler name should be settable');
+
+        assert.strictEqual(
+            (anonymousHandler as Function).name,
+            'send',
+            'Handler name should be settable',
+        );
     });
 
     it('should ensure names are unique per file', () => {
         const handler1 = handler(({config}) => ({send() {}}));
         const handler2 = handler(({config}) => ({receive() {}}));
-        
+
         // Simulate loading from different files
         Object.defineProperty(handler1, 'name', {value: 'send', configurable: true});
         Object.defineProperty(handler2, 'name', {value: 'receive', configurable: true});
-        
+
         assert.strictEqual((handler1 as Function).name, 'send');
         assert.strictEqual((handler2 as Function).name, 'receive');
-        assert.notStrictEqual((handler1 as Function).name, (handler2 as Function).name, 'Handlers should have unique names');
+        assert.notStrictEqual(
+            (handler1 as Function).name,
+            (handler2 as Function).name,
+            'Handlers should have unique names',
+        );
     });
 
     it('should detect mismatch between handler name and expected name', () => {
@@ -48,13 +60,13 @@ describe('Handler naming', () => {
         const namedHandler = handler(function wrongName({config}) {
             return {send() {}};
         });
-        
+
         // In Watch.ts, this would trigger an error like:
         // "Handler name mismatch in 'send.ts': function is named 'wrongName' but file is named 'send.ts'"
-        
+
         const actualName = (namedHandler as Function).name;
         const expectedName = 'send';
-        
+
         assert.notStrictEqual(actualName, expectedName, 'Mismatch should be detectable');
         assert.strictEqual(actualName, 'wrongName', 'Handler should preserve explicit name');
     });

package/src/jwt.ts

@@ -1,7 +1,7 @@
 import basic from '@fastify/basic-auth';
 import bearer from '@fastify/bearer-auth';
 import cookie from '@fastify/cookie';
-import {type Errors} from '@feasibleone/blong';
+import {type Errors} from '@feasibleone/blong/types';
 import type {FastifyInstance, FastifyPluginOptions, FastifyReply, FastifyRequest} from 'fastify';
 import fp from 'fastify-plugin';
 import {LRUCache} from 'lru-cache';

package/src/layerProxy.ts

@@ -4,7 +4,7 @@ import {
     type IApiSchema,
     type IErrorFactory,
     type IModuleConfig,
-} from '@feasibleone/blong';
+} from '@feasibleone/blong/types';
 import merge from 'ut-function.merge';
 
 import createPort from './adapter.ts';

package/src/load.ts

@@ -10,7 +10,7 @@ import {
     type Kind,
     type Kinds,
     type SolutionFactory,
-} from '@feasibleone/blong';
+} from '@feasibleone/blong/types';
 import {existsSync} from 'fs';
 import {readdir} from 'fs/promises';
 import {createRequire} from 'node:module';
@@ -28,6 +28,9 @@ const LAYER_FILE = 'layer' as const;
 
 /** Well-known layer folder names and their default activation per kind */
 const WELL_KNOWN_LAYERS: Record<string, {server?: object; browser?: object}> = {
+    init: {server: {default: true}, browser: {default: true}},
+    'server/init': {server: {default: true}},
+    'browser/init': {browser: {default: true}},
     error: {server: {default: true}},
     sim: {server: {integration: true}},
     adapter: {server: {default: true}},
@@ -37,6 +40,8 @@ const WELL_KNOWN_LAYERS: Record<string, {server?: object; browser?: object}> = {
     backend: {browser: {default: true}},
     component: {browser: {default: true}},
     test: {browser: {integration: true}},
+    'server/test': {server: {integration: true}},
+    'browser/test': {browser: {integration: true}},
 };
 
 /**
@@ -48,26 +53,20 @@ async function discoverLayerFolders(
     kind_: 'server' | 'browser',
     explicitChildren: Set<string>,
     configNames: string[],
-): Promise<Map<string, object>> {
-    const result = new Map<string, object>();
-    let entries: Dirent[];
-    try {
-        entries = (await readdir(base, {withFileTypes: true})) as Dirent[];
-    } catch {
-        return result;
-    }
-    for (const entry of entries) {
-        if (!entry.isDirectory()) continue;
-        const name = entry.name.toString();
+): Promise<[string, object][]> {
+    const result: [string, object][] = [];
+    for (const name of Object.keys(WELL_KNOWN_LAYERS)) {
         if (explicitChildren.has(name)) continue;
+        const layerFolder = join(base, name);
+        if (!existsSync(layerFolder)) continue;
         const layerFile = join(base, name, `${LAYER_FILE}.${kind_}.ts`);
         if (existsSync(layerFile)) {
             // Read activation from layer.server.ts / layer.browser.ts
             const mod = await import(layerFile).catch(() => null);
             const activation = mod?.default ?? {default: true};
-            result.set(name, activation);
+            result.push([name, activation]);
         } else if (name in WELL_KNOWN_LAYERS && WELL_KNOWN_LAYERS[name][kind_]) {
-            result.set(name, WELL_KNOWN_LAYERS[name][kind_]);
+            result.push([name, WELL_KNOWN_LAYERS[name][kind_]]);
         }
     }
     return result;
@@ -253,7 +252,8 @@ export default async function loadRealm<T extends TSchema>(
             configNames,
         );
         for (const [folderName, activation] of discoveredFolders) {
-            if (!(folderName in mergedConfig)) merge(mergedConfig, {[folderName]: activation});
+            if (!(folderName in mergedConfig))
+                merge(mergedConfig, {[basename(folderName)]: activation});
             extraChildren.push(`./${folderName}`);
         }
     }

package/src/loop.ts

@@ -1,4 +1,4 @@
-import type {IAdapterFactory, IMeta, ITypedError} from '@feasibleone/blong';
+import type {IAdapterFactory, IMeta, ITypedError} from '@feasibleone/blong/types';
 import type net from 'node:net';
 import {v4} from 'uuid';
 

package/src/orchestrator/common/dispatch.ts

@@ -1,4 +1,4 @@
-import {orchestrator, type IMeta} from '@feasibleone/blong';
+import {orchestrator, type IMeta} from '@feasibleone/blong/types';
 
 export default orchestrator<{destination?: string}>(({remote}) => ({
     activation: {

package/src/orchestrator/common/openapi.ts

@@ -1,4 +1,4 @@
-import {orchestrator} from '@feasibleone/blong';
+import {orchestrator} from '@feasibleone/blong/types';
 
 export default orchestrator<{api?: {namespace: Record<string, string | string[]>}}>(
     ({remote, registry}) => ({

package/src/orchestrator/index.ts

@@ -1,4 +1,4 @@
-import {realm} from '@feasibleone/blong';
+import {realm} from '@feasibleone/blong/types';
 
 export default realm(blong => ({
     url: import.meta.url,

package/src/scan.ts

@@ -0,0 +1,12 @@
+import type {Dirent} from 'fs';
+import {readdir} from 'fs/promises';
+import {join} from 'path';
+
+export default async function scan(...path: string[]): Promise<Dirent[]> {
+    const dirName = join(...path);
+    return (
+        await readdir(dirName.startsWith('file://') ? dirName.slice(7) : dirName, {
+            withFileTypes: true,
+        })
+    ).sort((a, b) => (a < b ? -1 : a > b ? 1 : 0));
+}

package/src/timeout.ts

@@ -1,4 +1,4 @@
-import type {IMeta} from '@feasibleone/blong';
+import type {IMeta} from '@feasibleone/blong/types';
 import hrtime from 'browser-process-hrtime';
 
 type HRTime = ReturnType<typeof hrtime>;
@@ -19,7 +19,7 @@ class Timeout {
 
     protected clean(): void {
         Array.from(this.#calls).forEach((end: {checkTimeout: (time: HRTime) => void}) =>
-            end.checkTimeout(now())
+            end.checkTimeout(now()),
         );
     }
 
@@ -27,7 +27,7 @@ class Timeout {
         onTimeout: (error: Error) => void,
         timeout: number,
         createTimeoutError: () => Error,
-        set?: Set<IEnd>
+        set?: Set<IEnd>,
     ): IEnd {
         this.#interval = this.#interval || setInterval(this.clean.bind(this), 500);
         const end: IEnd = (error?: Error) => {
@@ -54,7 +54,7 @@ class Timeout {
         fn: (params: unknown) => Promise<unknown>,
         $meta: IMeta,
         error: () => Error,
-        set: Set<IEnd>
+        set: Set<IEnd>,
     ): Promise<unknown> {
         if (Array.isArray($meta && $meta.timeout)) {
             return new Promise((resolve, reject) => {
@@ -70,7 +70,7 @@ class Timeout {
                     },
                     $meta.timeout,
                     error,
-                    set
+                    set,
                 );
                 Promise.resolve(params)
                     .then(fn)