@multiplatform.one/utils 5.0.27 → 6.0.1

package/lib/index.cjs

@@ -1,5 +1,6 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});// src/index.ts
-var index_default = {};
 
+//#region src/index.ts
+var src_default = {};
 
-exports.default = index_default;
+//#endregion
+module.exports = src_default;

package/lib/index.mjs

@@ -0,0 +1,5 @@
+//#region src/index.ts
+var src_default = {};
+
+//#endregion
+export { src_default as default };

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@multiplatform.one/utils",
-  "version": "5.0.27",
+  "version": "6.0.1",
   "description": "utilities for multiplatform.one",
-  "type": "module",
-  "sideEffects": false,
-  "keywords": ["multiplatform.one", "utils"],
+  "keywords": [
+    "multiplatform.one",
+    "utils"
+  ],
   "homepage": "https://multiplatform.one",
   "bugs": {
     "url": "https://gitlab.com/bitspur/multiplatform.one/multiplatform.one/issues",
@@ -12,51 +13,58 @@
   },
   "license": "Apache-2.0",
   "author": "BitSpur <support@risserlabs.com> (https://risserlabs.com)",
-  "main": "lib/index.cjs",
-  "module": "lib/index.js",
-  "source": "src/index.ts",
-  "types": "types/index.d.ts",
-  "scripts": {
-    "typecheck": "tsc --noEmit",
-    "build": "rm -rf lib types 2>/dev/null && tsc -b --emitDeclarationOnly && tsup",
-    "test": "vitest run --coverage --coverage.provider=v8 --coverage.reporter=text --coverage.reporter=lcov --coverage.reporter=html"
-  },
-  "files": ["bin", "lib", "types", "src"],
   "repository": {
     "type": "git",
     "url": "https://gitlab.com/bitspur/multiplatform.one/multiplatform.one"
   },
-  "devDependencies": {
-    "@types/node": "~20.12.14",
-    "@types/pg": "^8.10.9",
-    "tsup": "^8.3.5",
-    "typescript": "~5.3.3",
-    "vitest": "^1.4.0"
-  },
-  "engines": {
-    "node": ">=6.0.0"
-  },
-  "dependencies": {
-    "axios": "^1.7.9",
-    "pg": "^8.13.1",
-    "yaml": "^2.7.0"
-  },
+  "source": "src/index.ts",
+  "files": [
+    "bin",
+    "lib",
+    "types",
+    "src"
+  ],
+  "type": "module",
+  "sideEffects": false,
+  "main": "lib/index.cjs",
+  "module": "lib/index.js",
+  "types": "types/index.d.ts",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./types/index.d.ts",
       "import": "./lib/index.js",
       "require": "./lib/index.cjs"
     },
     "./dev": {
+      "source": "./src/dev.ts",
       "types": "./types/dev.d.ts",
-      "import": "./lib/dev.js",
+      "import": "./lib/dev.mjs",
       "require": "./lib/dev.cjs"
     },
-    "./meshConfig": {
-      "types": "./types/meshConfig.d.ts",
-      "import": "./lib/meshConfig.js",
-      "require": "./lib/meshConfig.cjs"
-    },
     "./package.json": "./package.json"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "axios": "^1.15.2",
+    "pg": "^8.20.0",
+    "yaml": "^2.8.3"
+  },
+  "devDependencies": {
+    "@types/node": "^25.6.0",
+    "@types/pg": "^8.20.0",
+    "@vitest/coverage-v8": "^4.1.5",
+    "typescript": "~5.9.3",
+    "vitest": "^4.1.5"
+  },
+  "engines": {
+    "node": ">=6.0.0"
+  },
+  "scripts": {
+    "typecheck": "tsc --noEmit",
+    "build": "rm -rf lib types 2>/dev/null && tsc -b --emitDeclarationOnly && tsdown",
+    "test": "vitest run --coverage --coverage.provider=v8 --coverage.reporter=text --coverage.reporter=lcov --coverage.reporter=html"
   }
-}
+}

package/src/dev.ts

@@ -1,24 +1,3 @@
-/*
- * File: /src/dev.ts
- * Project: @multiplatform.one/utils
- * File Created: 17-01-2025 23:30:37
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2025
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 import { spawnSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
@@ -44,16 +23,14 @@ export function lookupTranspileModules(
         ...new Set([
           projectRoot,
           path.resolve(projectRoot, "app"),
-          path.resolve(projectRoot, "packages", "ui"),
+          path.resolve(projectRoot, "features"),
           ...(packageDirs || []),
         ]),
       ].map((packageDir) => {
+        const pkgPath = path.join(packageDir, "package.json");
+        if (!fs.existsSync(pkgPath)) return [];
         try {
-          return (
-            JSON.parse(
-              fs.readFileSync(path.join(packageDir, "package.json"), "utf-8"),
-            ).transpileModules || []
-          );
+          return JSON.parse(fs.readFileSync(pkgPath, "utf-8")).transpileModules || [];
         } catch (err) {
           if (log) logger.error(err);
           return [];
@@ -77,16 +54,14 @@ export function lookupTamaguiModules(
         ...new Set([
           projectRoot,
           path.resolve(projectRoot, "app"),
-          path.resolve(projectRoot, "packages", "ui"),
+          path.resolve(projectRoot, "features"),
           ...(packageDirs || []),
         ]),
       ].map((packageDir) => {
+        const pkgPath = path.join(packageDir, "package.json");
+        if (!fs.existsSync(pkgPath)) return [];
         try {
-          return (
-            JSON.parse(
-              fs.readFileSync(path.join(packageDir, "package.json"), "utf-8"),
-            ).tamaguiModules || []
-          );
+          return JSON.parse(fs.readFileSync(pkgPath, "utf-8")).tamaguiModules || [];
         } catch (err) {
           if (log) logger.error(err);
           return [];
@@ -98,9 +73,7 @@ export function lookupTamaguiModules(
   return tamaguiModules;
 }
 
-export function resolveConfig(
-  keys: string[] = [],
-): Record<string, string | undefined> {
+export function resolveConfig(keys: string[] = []): Record<string, string | undefined> {
   return keys.reduce(
     (acc: Record<string, string | undefined>, key: string) => {
       if (process.env[key]) acc[key] = process.env[key];
@@ -119,7 +92,7 @@ export function lookupProjectRoot() {
     });
     _projectRoot = stdout.trim();
     return _projectRoot;
-  } catch (err) {
+  } catch {
     _projectRoot = process.cwd();
     return _projectRoot;
   }

package/src/index.ts

@@ -1,22 +1 @@
-/**
- * File: /src/index.ts
- * Project: @multiplatform.one/utils
- * File Created: 19-11-2024 20:26:31
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2024
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 export default {};

package/src/wait.spec.ts

@@ -0,0 +1,35 @@
+import { describe, expect, it } from "vitest";
+import { formatServiceList, waitServices } from "./wait";
+
+describe("formatServiceList", () => {
+  it("returns single service as-is", () => {
+    expect(formatServiceList(["frappe"])).toBe("frappe");
+  });
+
+  it("joins two services with 'and'", () => {
+    expect(formatServiceList(["frappe", "postgres"])).toBe("frappe and postgres");
+  });
+
+  it("joins three services with commas and 'and'", () => {
+    expect(formatServiceList(["frappe", "postgres", "keycloak"])).toBe(
+      "frappe, postgres and keycloak",
+    );
+  });
+
+  it("joins four services correctly", () => {
+    expect(formatServiceList(["a", "b", "c", "d"])).toBe("a, b, c and d");
+  });
+});
+
+describe("waitServices", () => {
+  it("contains the expected service names", () => {
+    expect(waitServices).toContain("frappe");
+    expect(waitServices).toContain("postgres");
+    expect(waitServices).toContain("mariadb");
+    expect(waitServices).toContain("keycloak");
+  });
+
+  it("has exactly 4 services", () => {
+    expect(waitServices).toHaveLength(4);
+  });
+});

package/src/wait.ts

@@ -1,49 +1,15 @@
-/*
- * File: /src/wait.ts
- * Project: @multiplatform.one/utils
- * File Created: 18-01-2025 18:38:49
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2025
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 import axios from "axios";
 import pg from "pg";
 
-export async function waitForApi(interval: number) {
-  try {
-    const res = await axios.get(
-      `http://localhost:${process.env.API_PORT || "5001"}/healthz`,
-    );
-    if ((res?.status || 500) < 300) {
-      return;
-    }
-  } catch (err) {}
-  await new Promise((resolve) => setTimeout(resolve, interval));
-  return waitForApi(interval);
-}
-
 export async function waitForFrappe(interval: number) {
   try {
     const res = await axios.get(
-      `${process.env.FRAPPE_BASE_URL || "http://frappe.localhost"}/api/method/ping`,
+      `${process.env.BASE_URL || "http://frappe.localhost"}/api/method/ping`,
     );
     if ((res?.status || 500) < 300) {
       return;
     }
-  } catch (err) {}
+  } catch {}
   await new Promise((resolve) => setTimeout(resolve, interval));
   return waitForFrappe(interval);
 }
@@ -62,7 +28,7 @@ export async function waitForPostgres(interval: number) {
       try {
         await client.query("SELECT 1");
         return;
-      } catch (error) {}
+      } catch {}
       await new Promise((resolve) => setTimeout(resolve, interval));
     }
   } finally {
@@ -70,15 +36,36 @@ export async function waitForPostgres(interval: number) {
   }
 }
 
+export async function waitForMariaDB(interval: number) {
+  const mysql = require("mysql2/promise");
+  const connection = await mysql.createConnection({
+    host: process.env.MARIADB_HOSTNAME || "localhost",
+    port: Number.parseInt(process.env.MARIADB_PORT || "3306"),
+    user: process.env.MARIADB_USERNAME || "root",
+    password: process.env.MARIADB_PASSWORD || "root",
+    database: process.env.MARIADB_DATABASE || "frappe",
+  });
+  try {
+    while (true) {
+      try {
+        await connection.execute("SELECT 1");
+        return;
+      } catch {}
+      await new Promise((resolve) => setTimeout(resolve, interval));
+    }
+  } finally {
+    await connection.end();
+  }
+}
+
 export async function waitForKeycloak(interval: number) {
+  const baseUrl = process.env.BASE_URL || "http://localhost:8000";
   try {
-    const res = await axios.get(
-      `${process.env.KEYCLOAK_BASE_URL || "http://localhost:8080"}/realms/master/.well-known/openid-configuration`,
-    );
+    const res = await axios.get(`${baseUrl}/auth/realms/master/.well-known/openid-configuration`);
     if ((res?.status || 500) < 300) {
       return;
     }
-  } catch (err) {}
+  } catch {}
   await new Promise((resolve) => setTimeout(resolve, interval));
   return waitForKeycloak(interval);
 }
@@ -89,11 +76,6 @@ export function formatServiceList(services: readonly string[]): string {
   return `${services.slice(0, -1).join(", ")} and ${services[services.length - 1]}`;
 }
 
-export const waitServices = [
-  "graphql",
-  "frappe",
-  "postgres",
-  "keycloak",
-] as const;
+export const waitServices = ["frappe", "postgres", "mariadb", "keycloak"] as const;
 
 export type WaitService = (typeof waitServices)[number];