@gjsify/os 0.0.2 → 0.0.4

package/lib/cjs/constants.js

@@ -1,25 +1,3 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var constants_exports = {};
-__export(constants_exports, {
-  default: () => constants_default
-});
-module.exports = __toCommonJS(constants_exports);
 var constants_default = {
   "UV_UDP_REUSEADDR": 4,
   "errno": {
@@ -139,3 +117,6 @@ var constants_default = {
     "SIGSYS": 31
   }
 };
+export {
+  constants_default as default
+};

package/lib/cjs/createSubnet.js

@@ -1,26 +1,3 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var createSubnet_exports = {};
-__export(createSubnet_exports, {
-  createSubnet: () => createSubnet,
-  default: () => createSubnet_default
-});
-module.exports = __toCommonJS(createSubnet_exports);
 function createSubnet(size, segment, base, sep) {
   const empty = "0".repeat(size);
   return (mask) => {
@@ -34,3 +11,7 @@ function createSubnet(size, segment, base, sep) {
 }
 ;
 var createSubnet_default = { createSubnet };
+export {
+  createSubnet,
+  createSubnet_default as default
+};

package/lib/cjs/darwin.js

@@ -1,36 +1,8 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var darwin_exports = {};
-__export(darwin_exports, {
-  cpus: () => cpus,
-  endianness: () => endianness,
-  freemem: () => freemem,
-  loadavg: () => loadavg,
-  networkInterfaces: () => networkInterfaces,
-  totalmem: () => totalmem,
-  uptime: () => uptime
-});
-module.exports = __toCommonJS(darwin_exports);
-var import_createSubnet = require("./createSubnet.js");
-var import_utils = require("@gjsify/utils");
+import { createSubnet } from "./createSubnet.js";
+import { cli } from "@gjsify/utils";
 const EOL = /\r\n|\n/;
 const NOMAC = "00:00:00:00:00:00";
-const getIPv6Subnet = (0, import_createSubnet.createSubnet)(128, 16, 16, ":");
+const getIPv6Subnet = createSubnet(128, 16, 16, ":");
 const parseInterfaces = function(info) {
   info = info.trim();
   if (info.length < 1 || !/\binet\b/.test(info))
@@ -73,12 +45,12 @@ const parseInterfaces = function(info) {
   this[info.slice(0, info.indexOf(":"))] = iface;
 };
 const cpus = () => {
-  let cores = parseFloat((0, import_utils.cli)("sysctl -n hw.ncpu"));
+  let cores = parseFloat(cli("sysctl -n hw.ncpu"));
   const cpus2 = [];
   while (cores--) {
     cpus2.push({
-      model: (0, import_utils.cli)("sysctl -n machdep.cpu.brand_string").replace(/\s+/g, " "),
-      speed: parseFloat((0, import_utils.cli)("sysctl -n hw.cpufrequency")) / 1e3 / 1e3,
+      model: cli("sysctl -n machdep.cpu.brand_string").replace(/\s+/g, " "),
+      speed: parseFloat(cli("sysctl -n hw.cpufrequency")) / 1e3 / 1e3,
       get times() {
         console.warn("cpus.times is not supported");
         return {};
@@ -88,9 +60,9 @@ const cpus = () => {
   return cpus2;
 };
 const endianness = () => "LE";
-const freemem = () => parseFloat((0, import_utils.cli)("sysctl -n hw.memsize")) - parseFloat((0, import_utils.cli)("sysctl -n hw.physmem"));
+const freemem = () => parseFloat(cli("sysctl -n hw.memsize")) - parseFloat(cli("sysctl -n hw.physmem"));
 const loadavg = () => /load\s+averages:\s+(\d+(?:\.\d+))\s+(\d+(?:\.\d+))\s+(\d+(?:\.\d+))/.test(
-  (0, import_utils.cli)("uptime")
+  cli("uptime")
 ) && [
   parseFloat(RegExp.$1),
   parseFloat(RegExp.$2),
@@ -99,7 +71,7 @@ const loadavg = () => /load\s+averages:\s+(\d+(?:\.\d+))\s+(\d+(?:\.\d+))\s+(\d+
 const networkInterfaces = () => {
   const ifaces = {};
   const groups = [];
-  const lines = (0, import_utils.cli)("ifconfig").split(EOL);
+  const lines = cli("ifconfig").split(EOL);
   const length = lines.length;
   for (let group = [], re = /^\S+?:/, i = 0; i < length; i++) {
     if (re.test(lines[i])) {
@@ -115,12 +87,12 @@ const networkInterfaces = () => {
   return ifaces;
 };
 const totalmem = () => {
-  let I, mem = (0, import_utils.cli)("free -b").split(EOL);
+  let I, mem = cli("free -b").split(EOL);
   mem[0].split(/\s+/).some((info, i) => info === "total" && (I = i));
   return parseFloat(mem[1].split(/\s+/)[I + 1]);
 };
 const uptime = () => {
-  const uptime2 = (0, import_utils.cli)("uptime");
+  const uptime2 = cli("uptime");
   const up = /up\s+([^,]+)?,/.test(uptime2) && RegExp.$1;
   switch (true) {
     case /^(\d+):(\d+)$/.test(up):
@@ -132,3 +104,12 @@ const uptime = () => {
   }
   return up;
 };
+export {
+  cpus,
+  endianness,
+  freemem,
+  loadavg,
+  networkInterfaces,
+  totalmem,
+  uptime
+};

package/lib/cjs/index.js

@@ -1,66 +1,22 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var src_exports = {};
-__export(src_exports, {
-  EOL: () => EOL,
-  constants: () => import_constants.default,
-  cpus: () => cpus,
-  endianness: () => endianness,
-  freemem: () => freemem,
-  homedir: () => homedir,
-  hostname: () => hostname,
-  loadavg: () => loadavg,
-  networkInterfaces: () => networkInterfaces,
-  release: () => release,
-  tmpdir: () => tmpdir,
-  type: () => type,
-  userInfo: () => userInfo
-});
-module.exports = __toCommonJS(src_exports);
-var import_utils = require("@gjsify/utils");
-var linux = __toESM(require("./linux.js"), 1);
-var darwin = __toESM(require("./darwin.js"), 1);
-var import_glib_2 = __toESM(require("@girs/glib-2.0"), 1);
-var import_constants = __toESM(require("./constants.js"), 1);
-const EOL = (0, import_utils.getPathSeparator)() === "/" ? "\n" : "\r\n";
-const homedir = () => import_glib_2.default.get_home_dir();
-const hostname = () => import_glib_2.default.get_host_name();
-const release = () => (0, import_utils.cli)("uname -r");
-const tmpdir = () => import_glib_2.default.get_tmp_dir();
-const type = () => (0, import_utils.cli)("uname");
+import { cli, getPathSeparator, getOs } from "@gjsify/utils";
+import * as linux from "./linux.js";
+import * as darwin from "./darwin.js";
+import GLib from "@girs/glib-2.0";
+import constants from "./constants.js";
+const EOL = getPathSeparator() === "/" ? "\n" : "\r\n";
+const homedir = () => GLib.get_home_dir();
+const hostname = () => GLib.get_host_name();
+const release = () => cli("uname -r");
+const tmpdir = () => GLib.get_tmp_dir();
+const type = () => cli("uname");
 const userInfo = () => ({
   uid: 1e3,
   gid: 100,
-  username: import_glib_2.default.get_user_name(),
-  homedir: import_glib_2.default.get_home_dir()
+  username: GLib.get_user_name(),
+  homedir: GLib.get_home_dir()
 });
 const cpus = () => {
-  const _os = (0, import_utils.getOs)();
+  const _os = getOs();
   switch (_os) {
     case "darwin":
       return darwin.cpus();
@@ -72,7 +28,7 @@ const cpus = () => {
   }
 };
 const endianness = () => {
-  const _os = (0, import_utils.getOs)();
+  const _os = getOs();
   switch (_os) {
     case "darwin":
       return darwin.endianness();
@@ -84,7 +40,7 @@ const endianness = () => {
   }
 };
 const freemem = () => {
-  const _os = (0, import_utils.getOs)();
+  const _os = getOs();
   switch (_os) {
     case "darwin":
       return darwin.freemem();
@@ -96,7 +52,7 @@ const freemem = () => {
   }
 };
 const loadavg = () => {
-  const _os = (0, import_utils.getOs)();
+  const _os = getOs();
   switch (_os) {
     case "darwin":
       return darwin.loadavg();
@@ -108,7 +64,7 @@ const loadavg = () => {
   }
 };
 const networkInterfaces = () => {
-  const _os = (0, import_utils.getOs)();
+  const _os = getOs();
   switch (_os) {
     case "darwin":
       return darwin.networkInterfaces();
@@ -119,3 +75,18 @@ const networkInterfaces = () => {
       break;
   }
 };
+export {
+  EOL,
+  constants,
+  cpus,
+  endianness,
+  freemem,
+  homedir,
+  hostname,
+  loadavg,
+  networkInterfaces,
+  release,
+  tmpdir,
+  type,
+  userInfo
+};

package/lib/cjs/linux.js

@@ -1,36 +1,8 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var linux_exports = {};
-__export(linux_exports, {
-  cpus: () => cpus,
-  endianness: () => endianness,
-  freemem: () => freemem,
-  loadavg: () => loadavg,
-  networkInterfaces: () => networkInterfaces,
-  totalmem: () => totalmem,
-  uptime: () => uptime
-});
-module.exports = __toCommonJS(linux_exports);
-var import_createSubnet = require("./createSubnet.js");
-var import_utils = require("@gjsify/utils");
+import { createSubnet } from "./createSubnet.js";
+import { cli } from "@gjsify/utils";
 const EOL = /\r\n|\n/;
-const getIPv4Subnet = (0, import_createSubnet.createSubnet)(32, 8, 10, ".");
-const getIPv6Subnet = (0, import_createSubnet.createSubnet)(128, 16, 16, ":");
+const getIPv4Subnet = createSubnet(32, 8, 10, ".");
+const getIPv6Subnet = createSubnet(128, 16, 16, ":");
 function parseInterfaces(info) {
   info = info.trim();
   if (info.length < 1)
@@ -64,7 +36,7 @@ const cpus = () => {
   const FREQ = /^cpu[\s_]+MHz\s*:\s*(\d+)/i;
   const cpus2 = [];
   let cpu;
-  (0, import_utils.cli)("cat /proc/cpuinfo").split(EOL).forEach((line) => {
+  cli("cat /proc/cpuinfo").split(EOL).forEach((line) => {
     switch (true) {
       case PROCESSOR.test(line):
         cpus2[RegExp.$1.trim()] = cpu = {
@@ -87,12 +59,12 @@ const cpus = () => {
 };
 const endianness = () => "LE";
 const freemem = () => {
-  let I, mem = (0, import_utils.cli)("free -b").split(EOL);
+  let I, mem = cli("free -b").split(EOL);
   mem[0].split(/\s+/).some((info, i) => info === "free" && (I = i));
   return parseFloat(mem[1].split(/\s+/)[I + 1]);
 };
 const loadavg = () => /(\d+(?:\.\d+))\s+(\d+(?:\.\d+))\s+(\d+(?:\.\d+))/.test(
-  (0, import_utils.cli)("cat /proc/loadavg")
+  cli("cat /proc/loadavg")
 ) && [
   parseFloat(RegExp.$1),
   parseFloat(RegExp.$2),
@@ -100,12 +72,21 @@ const loadavg = () => /(\d+(?:\.\d+))\s+(\d+(?:\.\d+))\s+(\d+(?:\.\d+))/.test(
 ];
 const networkInterfaces = () => {
   const ifaces = {};
-  (0, import_utils.cli)("ip addr").split(/^\d+:\s+/m).forEach(parseInterfaces, ifaces);
+  cli("ip addr").split(/^\d+:\s+/m).forEach(parseInterfaces, ifaces);
   return ifaces;
 };
 const totalmem = () => {
-  let I, mem = (0, import_utils.cli)("free -b").split(EOL);
+  let I, mem = cli("free -b").split(EOL);
   mem[0].split(/\s+/).some((info, i) => info === "total" && (I = i));
   return parseFloat(mem[1].split(/\s+/)[I + 1]);
 };
-const uptime = () => (Date.now() - Date.parse((0, import_utils.cli)("uptime -s").replace(" ", "T"))) / 1e3;
+const uptime = () => (Date.now() - Date.parse(cli("uptime -s").replace(" ", "T"))) / 1e3;
+export {
+  cpus,
+  endianness,
+  freemem,
+  loadavg,
+  networkInterfaces,
+  totalmem,
+  uptime
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjsify/os",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Node.js os module for Gjs",
   "main": "lib/cjs/index.js",
   "module": "lib/esm/index.js",
@@ -35,10 +35,10 @@
     "os"
   ],
   "dependencies": {
-    "@girs/gjs": "^3.1.0",
-    "@gjsify/utils": "^0.0.2"
+    "@girs/gjs": "^3.2.6",
+    "@gjsify/utils": "^0.0.4"
   },
   "devDependencies": {
-    "@gjsify/cli": "^0.0.2"
+    "@gjsify/cli": "^0.0.4"
   }
 }