@gandalan/weblibs 1.5.25 → 1.5.27

package/index.d.ts

@@ -1,4 +1,21 @@
 export * from "./index.js";
+export { IDASFactory } from "./api/IDAS.js";
+export { RESTClient } from "./api/RESTClient.js";
+export { initIDAS } from "./api/authUtils.js";
+export { createApi, fluentApi } from "./api/fluentApi.js";
+export { createIDASApi, idasFluentApi } from "./api/idasFluentApi.js";
+export { createAuthManager, fluentIdasAuthManager } from "./api/fluentAuthManager.js";
+export { fetchEnvConfig } from "./api/fluentEnvUtils.js";
+export { restClient } from "./api/fluentRestClient.js";
+export function createApi(): FluentApi;
+export function fluentApi(url: string, authManager: FluentAuthManager | null, serviceName: string): FluentApi;
+export function createIDASApi(): IDASFluentApi;
+export function idasFluentApi(url: string, authManager: FluentAuthManager, serviceName: string): IDASFluentApi;
+export function createAuthManager(): FluentAuthManager;
+export function fluentIdasAuthManager(appToken: string, authBaseUrl: string): FluentAuthManager;
+export function fetchEnvConfig(envConfig?: string): Promise<EnvironmentConfig>;
+export function restClient(): FluentRESTClient;
+export function initIDAS(appToken: string): Promise<Settings | null>;
 
 export type AblageApi = {
     get: (guid: string) => Promise<AblageDTO>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gandalan/weblibs",
-  "version": "1.5.25",
+  "version": "1.5.27",
   "description": "WebLibs for Gandalan JS/TS projects",
   "keywords": [
     "gandalan"

package/scripts/generate-root-dto-typedefs.mjs

@@ -18,13 +18,34 @@ const dtoLeafDirectory = path.join(rootDir, "api", "dtos");
 const businessLeafDirectory = path.join(rootDir, "api", "business");
 const uiLeafDirectory = path.join(rootDir, "ui");
 
-const sourceDirectories = ["api", "ui"];
-
 const dtoRootMarkerStart = "// BEGIN GENERATED ROOT DTO TYPEDEFS";
 const dtoRootMarkerEnd = "// END GENERATED ROOT DTO TYPEDEFS";
 const businessRootMarkerStart = "// BEGIN GENERATED ROOT BUSINESS TYPEDEFS";
 const businessRootMarkerEnd = "// END GENERATED ROOT BUSINESS TYPEDEFS";
 
+const rootValueExportStatements = [
+    "export { IDASFactory } from \"./api/IDAS.js\";",
+    "export { RESTClient } from \"./api/RESTClient.js\";",
+    "export { initIDAS } from \"./api/authUtils.js\";",
+    "export { createApi, fluentApi } from \"./api/fluentApi.js\";",
+    "export { createIDASApi, idasFluentApi } from \"./api/idasFluentApi.js\";",
+    "export { createAuthManager, fluentIdasAuthManager } from \"./api/fluentAuthManager.js\";",
+    "export { fetchEnvConfig } from \"./api/fluentEnvUtils.js\";",
+    "export { restClient } from \"./api/fluentRestClient.js\";"
+];
+
+const rootFunctionDeclarationStatements = [
+    "export function createApi(): FluentApi;",
+    "export function fluentApi(url: string, authManager: FluentAuthManager | null, serviceName: string): FluentApi;",
+    "export function createIDASApi(): IDASFluentApi;",
+    "export function idasFluentApi(url: string, authManager: FluentAuthManager, serviceName: string): IDASFluentApi;",
+    "export function createAuthManager(): FluentAuthManager;",
+    "export function fluentIdasAuthManager(appToken: string, authBaseUrl: string): FluentAuthManager;",
+    "export function fetchEnvConfig(envConfig?: string): Promise<EnvironmentConfig>;",
+    "export function restClient(): FluentRESTClient;",
+    "export function initIDAS(appToken: string): Promise<Settings | null>;"
+];
+
 const simpleImportTypePattern = /^import\((?:"|').+(?:"|')\)\.[A-Za-z0-9_$]+$/;
 const returnTypeOfCreateApiPattern = /^ReturnType<\s*typeof\s+(create[A-Za-z0-9_$]+Api)\s*>$/;
 
@@ -244,16 +265,6 @@ function toRelativeImportPath(fromFilePath, targetFilePath) {
     return relativePath.startsWith(".") ? relativePath : `./${relativePath}`;
 }
 
-function toRelativeDtsImportPath(fromFilePath, targetFilePath) {
-    const importPath = toRelativeImportPath(fromFilePath, targetFilePath);
-
-    if (targetFilePath === path.join(rootDir, "api", "neherApp3Types.js")) {
-        return importPath.replace(/\.js$/, "");
-    }
-
-    return importPath;
-}
-
 function getJSDocBlocks(source) {
     return source.match(/\/\*\*[\s\S]*?\*\//g) ?? [];
 }
@@ -1501,6 +1512,8 @@ function replaceGeneratedBlock(source, startMarker, endMarker, generatedBlock, t
 function buildRootDts(publicTypeEntries) {
     const lines = [
         "export * from \"./index.js\";",
+        ...rootValueExportStatements,
+        ...rootFunctionDeclarationStatements,
         ""
     ];