@xnoxs/flux-lang 4.0.2 → 4.0.4

package/src/self/config.js

@@ -1,3 +1,5 @@
+/* compiled from src/self/config.flux by Flux Lang */
+'use strict';
 // ── Flux stdlib ──
 
 function join(arr, sep) { return arr.join(sep != null ? sep : ','); }
@@ -14,10 +16,23 @@ function endsWith(s, suffix) { return String(s).endsWith(suffix); }
 
 const Fs = require("fs");
 const Path = require("path");
-const DEFAULT_CONFIG = { entry: "src/main.flux", outDir: "dist", sourcemap: false, mangle: false, jsx: false, jsxTarget: "browser", typecheck: true, strict: false, watch: false, ignore: [], selfHosted: false, registry: "https://registry.flux-lang.dev", pkg: { name: "", version: "1.0.0", description: "", author: "", license: "MIT", deps: {  }, devDeps: {  } } };
+const DEFAULT_CONFIG = { entry: "src/main.flux", outDir: "dist", sourcemap: false, mangle: false, jsx: false, jsxTarget: "browser", typecheck: true, strict: false, watch: false, ignore: [], selfHosted: false, registry: "https://registry.npmjs.org", pkg: { name: "", version: "1.0.0", description: "", author: "", license: "MIT", deps: {  }, devDeps: {  } } };
 module.exports.DEFAULT_CONFIG = DEFAULT_CONFIG;
 function loadConfig(cwd_) {
   const cwd = (cwd_ ?? process.cwd());
+  const pkgJsonPath = Path.join(cwd, "package.json");
+  if (Fs.existsSync(pkgJsonPath)) {
+    try {
+      const raw = Fs.readFileSync(pkgJsonPath, "utf8");
+      const parsed = JSON.parse(raw);
+      if ((parsed.flux && (typeof parsed.flux == "object"))) {
+        return mergeConfig(DEFAULT_CONFIG, parsed.flux);
+      }
+    }
+    catch (e) {
+      throw new Error(("Invalid package.json: " + e.message));
+    }
+  }
   const jsonPath = Path.join(cwd, "flux.json");
   if (Fs.existsSync(jsonPath)) {
     try {
@@ -29,16 +44,6 @@ function loadConfig(cwd_) {
       throw new Error(("Invalid flux.json: " + e.message));
     }
   }
-  const jsPath = Path.join(cwd, "flux.config.js");
-  if (Fs.existsSync(jsPath)) {
-    try {
-      const loaded = require(jsPath);
-      return mergeConfig(DEFAULT_CONFIG, loaded);
-    }
-    catch (e2) {
-      throw new Error(("Invalid flux.config.js: " + e2.message));
-    }
-  }
   return { ...DEFAULT_CONFIG };
 }
 module.exports.loadConfig = loadConfig;
@@ -58,9 +63,18 @@ function mergeConfig(base, overrides) {
 module.exports.mergeConfig = mergeConfig;
 function writeConfig(config, cwd_) {
   const cwd = (cwd_ ?? process.cwd());
-  const jsonPath = Path.join(cwd, "flux.json");
-  const content = (JSON.stringify(config, null, 2) + "\n");
-  Fs.writeFileSync(jsonPath, content, "utf8");
+  const pkgPath = Path.join(cwd, "package.json");
+  let pkg = {  };
+  if (Fs.existsSync(pkgPath)) {
+    try {
+      pkg = JSON.parse(Fs.readFileSync(pkgPath, "utf8"));
+    }
+    catch (e) {
+      pkg = {  };
+    }
+  }
+  pkg.flux = config;
+  Fs.writeFileSync(pkgPath, (JSON.stringify(pkg, null, 2) + "\n"), "utf8");
 }
 module.exports.writeConfig = writeConfig;
 function validateConfig(config) {
@@ -76,19 +90,19 @@ function validateConfig(config) {
 module.exports.validateConfig = validateConfig;
 function readPackage(cwd_) {
   const cwd = (cwd_ ?? process.cwd());
-  const fluxJson = Path.join(cwd, "flux.json");
   const pkgJson = Path.join(cwd, "package.json");
-  if (Fs.existsSync(fluxJson)) {
+  const fluxJson = Path.join(cwd, "flux.json");
+  if (Fs.existsSync(pkgJson)) {
     try {
-      return JSON.parse(Fs.readFileSync(fluxJson, "utf8"));
+      return JSON.parse(Fs.readFileSync(pkgJson, "utf8"));
     }
     catch (e) {
       return null;
     }
   }
-  if (Fs.existsSync(pkgJson)) {
+  if (Fs.existsSync(fluxJson)) {
     try {
-      return JSON.parse(Fs.readFileSync(pkgJson, "utf8"));
+      return JSON.parse(Fs.readFileSync(fluxJson, "utf8"));
     }
     catch (e2) {
       return null;

package/src/self/pkg.js

@@ -1,7 +1,7 @@
+/* compiled from src/self/pkg.flux by Flux Lang */
+'use strict';
 // ── Flux stdlib ──
 
-function map(arr, fn) { return arr.map(fn); }
-
 function join(arr, sep) { return arr.join(sep != null ? sep : ','); }
 
 function keys(obj) { return Object.keys(obj); }
@@ -17,10 +17,8 @@ const Path = require("path");
 const Https = require("https");
 const Http = require("http");
 const Os = require("os");
-const { readPackage, writeConfig, loadConfig } = require("./config");
+const { readPackage } = require("./config");
 const REGISTRY_URL = "https://registry.npmjs.org";
-const FLUX_PKG_DIR = "flux_modules";
-const PKG_FILE = "flux.json";
 const ESC = "\u001b";
 const C = { reset: (ESC + "[0m"), bold: (ESC + "[1m"), dim: (ESC + "[2m"), red: (ESC + "[31m"), green: (ESC + "[32m"), yellow: (ESC + "[33m"), blue: (ESC + "[34m"), cyan: (ESC + "[36m"), gray: (ESC + "[90m") };
 function clr(c, s) {
@@ -79,21 +77,6 @@ async function fetchJson(url) {
   }
   return new Promise(doRequest);
 }
-function ensureFluxJson(cwd_) {
-  const cwd = (cwd_ ?? process.cwd());
-  const file = Path.join(cwd, PKG_FILE);
-  if (!Fs.existsSync(file)) {
-    const pkg = { name: Path.basename(cwd), version: "1.0.0", description: "", author: "", license: "MIT", scripts: { start: "flux run src/main.flux", build: "flux bundle src/main.flux -o dist/bundle.js", dev: "flux watch src/main.flux", check: "flux check src/main.flux" }, dependencies: {  }, devDependencies: {  } };
-    Fs.writeFileSync(file, (JSON.stringify(pkg, null, 2) + "\n"), "utf8");
-    ok("Created flux.json");
-  }
-  return JSON.parse(Fs.readFileSync(file, "utf8"));
-}
-function saveFluxJson(pkg, cwd_) {
-  const cwd = (cwd_ ?? process.cwd());
-  const file = Path.join(cwd, PKG_FILE);
-  Fs.writeFileSync(file, (JSON.stringify(pkg, null, 2) + "\n"), "utf8");
-}
 function parsePackageSpec(spec) {
   const atIdx = spec.lastIndexOf("@");
   if ((atIdx > 0)) {
@@ -102,118 +85,61 @@ function parsePackageSpec(spec) {
   return { name: spec, version: "latest" };
 }
 async function cmdAdd(specs, opts) {
+  const { execSync } = require("child_process");
   const isDev = (opts?.dev ?? false);
   const cwd = process.cwd();
-  const pkg = ensureFluxJson(cwd);
   for (const spec of specs) {
     const { name, version } = parsePackageSpec(spec);
-    const spinner = startSpinner(((("Fetching " + clr(C.bold, name)) + clr(C.gray, ("@" + version))) + " ..."));
+    const spinner = startSpinner(((("Adding " + clr(C.bold, name)) + clr(C.gray, ("@" + version))) + " ..."));
     try {
-      const info_ = await fetchJson(((REGISTRY_URL + "/") + name));
-      const resolvedVersion = ((version == "latest") ? (info_["dist-tags"]?.latest ?? "1.0.0") : version);
-      const versionInfo = info_.versions?.[resolvedVersion];
+      const saveFlag = (isDev ? "--save-dev" : "--save");
+      const pkgSpec = ((version == "latest") ? name : ((name + "@") + version));
       stopSpinner(spinner);
-      if (!versionInfo) {
-        err(((("Version " + resolvedVersion) + " not found for ") + name));
-        continue;
-      }
-      const depKey = (isDev ? "devDependencies" : "dependencies");
-      if (!pkg[depKey]) {
-        pkg[depKey] = {  };
-      }
-      pkg[depKey][name] = ("^" + resolvedVersion);
-      saveFluxJson(pkg, cwd);
-      const desc = (versionInfo.description ? clr(C.gray, (" — " + versionInfo.description)) : "");
-      ok(((name + clr(C.green, ("@" + resolvedVersion))) + desc));
-      info(("Added to " + (isDev ? "devDependencies" : "dependencies")));
+      console.log(((clr(C.cyan, "  Adding ") + clr(C.bold, pkgSpec)) + clr(C.gray, " to node_modules/ and package.json...")));
+      execSync(((("npm install " + pkgSpec) + " ") + saveFlag), { cwd, stdio: "inherit" });
+      ok((("Added " + clr(C.bold, name)) + " to node_modules/ and package.json"));
     }
     catch (e) {
       stopSpinner(spinner);
-      err(((("Failed to fetch " + name) + ": ") + e.message));
+      err(((("Failed to add " + name) + ": ") + e.message));
     }
   }
   console.log();
-  console.log(((clr(C.gray, "  Run ") + clr(C.yellow, "flux install")) + clr(C.gray, " to install packages")));
-  console.log();
 }
 module.exports.cmdAdd = cmdAdd;
 function cmdRemove(names, opts) {
+  const { execSync } = require("child_process");
   const cwd = process.cwd();
-  const pkg = ensureFluxJson(cwd);
-  let removed = 0;
   for (const name of names) {
-    let found = false;
-    if ((pkg.dependencies && pkg.dependencies[name])) {
-      delete pkg.dependencies[name];
-      found = true;
-    }
-    if ((pkg.devDependencies && pkg.devDependencies[name])) {
-      delete pkg.devDependencies[name];
-      found = true;
-    }
-    if (found) {
+    try {
+      console.log(((clr(C.cyan, "  Removing ") + clr(C.bold, name)) + " ..."));
+      execSync(("npm uninstall " + name), { cwd, stdio: "inherit" });
       ok(("Removed " + clr(C.bold, name)));
-      removed = (removed + 1);
     }
-    else {
-      err((name + " not found in flux.json"));
+    catch (e) {
+      err(((("Failed to remove " + name) + ": ") + e.message));
     }
   }
-  if ((removed > 0)) {
-    saveFluxJson(pkg, cwd);
-  }
 }
 module.exports.cmdRemove = cmdRemove;
 async function cmdInstall(opts) {
   const { execSync } = require("child_process");
   const cwd = process.cwd();
-  const pkg = ensureFluxJson(cwd);
-  const fluxModDir = Path.join(cwd, "flux_modules");
-  const deps = (pkg.dependencies ?? {  });
-  const devDeps = (pkg.devDependencies ?? {  });
-  const all = { ...deps, ...devDeps };
-  const names = Object.keys(all);
-  if ((names.length == 0)) {
-    info("No dependencies found in flux.json");
+  const pkgJsonPath = Path.join(cwd, "package.json");
+  if (!Fs.existsSync(pkgJsonPath)) {
+    err("No package.json found. Run: flux init");
     return;
   }
-  console.log(((clr(C.cyan, "\n  Installing ") + names.length) + " package(s) into flux_modules/...\n"));
-  for (const name of names) {
-    const spec = all[name];
-    console.log(((clr(C.gray, "  ○ ") + name) + clr(C.gray, ("@" + spec))));
-  }
-  console.log();
-  if (!Fs.existsSync(fluxModDir)) {
-    Fs.mkdirSync(fluxModDir, { recursive: true });
-  }
-  const fluxPkgFile = Path.join(fluxModDir, "package.json");
-  if (!Fs.existsSync(fluxPkgFile)) {
-    const fluxPkg = { name: (pkg.name + "-flux-modules"), version: "1.0.0", private: true };
-    Fs.writeFileSync(fluxPkgFile, (JSON.stringify(fluxPkg, null, 2) + "\n"), "utf8");
-  }
-  const prodNames = Object.keys(deps);
-  const devNames = Object.keys(devDeps);
+  console.log(clr(C.cyan, "\n  Installing dependencies from package.json...\n"));
   try {
-    if ((prodNames.length > 0)) {
-      const prodPkgs = prodNames.map((n) => ((n + "@") + (deps[n] ?? "latest"))).join(" ");
-      const installCmd = ((("npm install --prefix " + fluxModDir) + " ") + prodPkgs);
-      info(("Running: " + installCmd));
-      execSync(installCmd, { cwd, stdio: "inherit" });
-    }
-    if ((devNames.length > 0)) {
-      const devPkgs = devNames.map((n) => ((n + "@") + (devDeps[n] ?? "latest"))).join(" ");
-      const devCmd = ((("npm install --prefix " + fluxModDir) + " --save-dev ") + devPkgs);
-      info(("Running: " + devCmd));
-      execSync(devCmd, { cwd, stdio: "inherit" });
-    }
+    execSync("npm install", { cwd, stdio: "inherit" });
     console.log();
-    ok((names.length + " package(s) installed into flux_modules/node_modules/"));
-    info("Packages resolve automatically when using: flux run, flux bundle");
+    ok("Dependencies installed into node_modules/");
   }
   catch (e) {
     console.log();
     err(("Install failed: " + e.message));
-    info("Try manually: npm install --prefix ./flux_modules <package>");
+    info("Try manually: npm install");
   }
   console.log();
 }
@@ -222,7 +148,7 @@ function cmdList(opts) {
   const cwd = process.cwd();
   const pkg = readPackage(cwd);
   if (!pkg) {
-    err("No flux.json found. Run: flux init");
+    err("No package.json found. Run: flux init");
     return;
   }
   console.log();
@@ -311,11 +237,12 @@ async function cmdInfo(name, opts) {
 }
 module.exports.cmdInfo = cmdInfo;
 async function cmdUpgrade(opts) {
+  const { execSync } = require("child_process");
   const isCheck = (opts?.check ?? false);
   const cwd = process.cwd();
   const pkg = readPackage(cwd);
   if (!pkg) {
-    err("No flux.json found. Run: flux init");
+    err("No package.json found. Run: flux init");
     return;
   }
   const deps = (pkg.dependencies ?? {  });
@@ -356,11 +283,9 @@ async function cmdUpgrade(opts) {
           console.log((((("  " + clr(C.yellow, "↑ ")) + clr(C.bold, name)) + clr(C.gray, (("  " + current) + " → "))) + clr(C.green, ("^" + latest))));
         }
         else {
-          const isDev = (devDeps[name] != null);
-          const depKey = (isDev ? "devDependencies" : "dependencies");
-          pkg[depKey][name] = ("^" + latest);
           updated = (updated + 1);
           console.log((((("  " + clr(C.green, "✓ ")) + clr(C.bold, name)) + clr(C.gray, (("  " + current) + " → "))) + clr(C.green, ("^" + latest))));
+          execSync((((("npm install " + name) + "@") + latest) + " --save"), { cwd, stdio: "pipe" });
         }
       }
     }
@@ -384,9 +309,7 @@ async function cmdUpgrade(opts) {
       ok("All packages are already up to date");
     }
     else {
-      saveFluxJson(pkg, cwd);
-      ok((updated + " package(s) updated in flux.json"));
-      console.log(((clr(C.gray, "  Run ") + clr(C.yellow, "flux install")) + clr(C.gray, " to install updated versions")));
+      ok((updated + " package(s) updated in node_modules/ and package.json"));
     }
   }
   console.log();
@@ -396,20 +319,19 @@ function cmdPublish(opts) {
   const cwd = process.cwd();
   const pkg = readPackage(cwd);
   if (!pkg) {
-    err("No flux.json found. Run: flux init");
+    err("No package.json found. Run: flux init");
     return;
   }
   console.log();
   console.log(((clr(C.cyan, "  Publishing ") + clr(C.bold, ((pkg.name + "@") + pkg.version))) + " ..."));
   console.log();
-  info("Building package...");
-  info("Checking flux.json...");
+  info("Checking package.json...");
   if (!pkg.name) {
-    err("flux.json must have a name field");
+    err("package.json must have a name field");
     return;
   }
   if (!pkg.version) {
-    err("flux.json must have a version field");
+    err("package.json must have a version field");
     return;
   }
   console.log();