@digigov/cli 1.1.0 → 1.1.1-rc.10

package/README.md

@@ -19,7 +19,7 @@ $ npm install -g @digigov/cli
 $ digigov COMMAND
 running command...
 $ digigov (-v|--version|version)
-@digigov/cli/1.1.0 darwin-arm64 node-v18.19.0
+@digigov/cli/1.1.1-rc.10 darwin-arm64 node-v16.20.2
 $ digigov --help [COMMAND]
 USAGE
   $ digigov COMMAND

package/lib.js

@@ -1,228 +1,17 @@
-const pkgUp = require("pkg-up");
 const fs = require("fs-extra");
 const path = require("path");
-const merge = require("deepmerge");
 const execa = require("execa");
 const glob = require("glob");
 const { Command } = require("@oclif/command");
+const {
+  makeConfig,
+  resolveLocalPackages,
+  aliases,
+  resolveProject,
+  resolveWorkspace,
+  extractCommandArgs
+} = require("./resolveProject");
 
-function resolveProject(dir) {
-  const pkg = pkgUp.sync({ cwd: dir || process.cwd() });
-  const root = path.dirname(pkg);
-  let externalLockFile = false;
-  if (
-    fs.existsSync(path.join(root, "yarn.lock")) ||
-    fs.existsSync(path.join(root, "package-lock.json"))
-  ) {
-    externalLockFile = true;
-  }
-  let distDir = "dist";
-  let src = "src";
-  let workspace = {};
-  if (!fs.existsSync(path.join(root, src))) {
-    src = ".";
-    distDir = ".";
-  }
-  // project type heuristics
-  let isLib = false;
-  let isWorkspace = false;
-  let isApp = false;
-  let isDocs = false;
-
-  if (
-    fs.existsSync(path.join(root, "next.config.js")) ||
-    fs.existsSync(path.join(root, "pages"))
-  ) {
-    isApp = true;
-  }
-  if (
-    fs.existsSync(path.join(root, "docusaurus.config.js")) &&
-    fs.existsSync(path.join(root, "docs"))
-  ) {
-    isDocs = true;
-  }
-  if (fs.existsSync(path.join(root, "src")) && !isApp) {
-    isLib = true;
-  }
-
-  const rush = resolveWorkspace();
-  if (rush) {
-    isWorkspace = true;
-    workspace = {
-      config: rush,
-      root: rush.rushJsonFolder,
-    };
-  }
-
-  const isNodeLib = !isLib && !isApp && !isWorkspace && !isDocs;
-
-  let ignore = path.resolve(root, ".gitignore");
-  if (!fs.existsSync(ignore) && workspace.root) {
-    ignore = path.resolve(workspace.root, ".gitignore");
-  }
-
-  if (!fs.existsSync(ignore)) {
-    ignore = null;
-  }
-
-  let digigov = {};
-  if (fs.existsSync(path.join(root, "digigovrc.json"))) {
-    digigov = require(path.join(root, "digigovrc.json"));
-  }
-  if (fs.existsSync(path.join(root, "digigovrc.js"))) {
-    digigov = require(path.join(root, "digigovrc.js"));
-  }
-
-  const packageJS = require(pkg);
-
-  const devDependencies = packageJS.devDependencies || {};
-  const dependencies = packageJS.dependencies || {};
-  const peerDependencies = packageJS.peerDependencies || {};
-  const isTs = Object.keys(devDependencies).includes("typescript");
-  const allDependencies = {
-    ...dependencies,
-    ...devDependencies,
-    ...peerDependencies,
-  };
-  // hook applies extra properties based on project type
-  return {
-    name: packageJS.name,
-    isTs,
-    isLib,
-    isApp,
-    isDocs,
-    isWorkspace,
-    isNodeLib,
-    distDir,
-    package: packageJS,
-    dependencies: allDependencies,
-    src,
-    root,
-    workspace,
-    ignore,
-    digigov,
-    externalLockFile,
-  };
-}
-
-function localRequire(file, dflt) {
-  const project = resolveProject();
-  const filePath = path.join(project.root, file);
-  if (fs.existsSync(filePath)) {
-    return require(filePath);
-  }
-  return dflt;
-}
-
-function makeConfig(file, cfg) {
-  let hook = {};
-  if (file && typeof file !== "string") {
-    hook = file;
-  } else if (typeof file === "string") {
-    hook = localRequire(file, {});
-  }
-  if (typeof hook === "function") {
-    return hook(cfg);
-  }
-  if (hook) {
-    return merge(cfg, hook);
-  }
-}
-
-function resolveWorkspace(dir) {
-  try {
-    const rushLib = require("@microsoft/rush-lib");
-    const rushConfiguration = rushLib.RushConfiguration.loadFromDefaultLocation(
-      {
-        startingFolder: process.cwd(),
-      },
-    );
-    return rushConfiguration;
-  } catch (err) {
-    // console.log(err);
-  }
-}
-
-/*
-Identify if project running the command from, is lerna-enabled. If so, return
-lerna registered projects metadata.
-*/
-function resolveLocalPackages(dir, dependencies) {
-  const packages = {};
-  const rush = resolveWorkspace(dir);
-  if (rush) {
-    rush.projects.forEach((p) => {
-      if (dependencies.includes(p.packageName)) {
-        packages[p.packageName] = resolveProject(p.projectFolder);
-      }
-    });
-    return packages;
-  }
-  return {};
-}
-
-/**
- * Map `resolveLocalPackages` result to a babel/jest compatible package aliases
- * object. Use only packages which are declared as a dependency for the current
- * project
- */
-function aliases(dir, absolute = false) {
-  const aliases = {};
-  const project = resolveProject(dir);
-  const depKeys = ["dependencies", "peerDependencies", "devDependencies"];
-  const root = project.root;
-  const deps = depKeys.reduce((deps, key) => {
-    return deps.concat(Object.keys(project.package[key] || {}));
-  }, []);
-  const packages = resolveLocalPackages(project.root, deps);
-  Object.keys(packages).forEach((key) => {
-    const project = packages[key];
-    if (
-      deps.includes(project.name) &&
-      project.package.devDependencies &&
-      project.package.devDependencies["@digigov/cli-build"] &&
-      project.isWorkspace
-    ) {
-      const projectSrc = path.join(project.root, project.src);
-      if (absolute) {
-        aliases[project.name] = path.resolve(root, projectSrc);
-      } else {
-        aliases[project.name] = projectSrc;
-      }
-    }
-  });
-  if (absolute) {
-    aliases[project.name] = path.resolve(root, project.src);
-  } else {
-    aliases[project.name] = project.src;
-  }
-  return aliases;
-}
-
-const extractCommandArgs = (config, commandArgs) => {
-  const vars = Object.values(args).reduce((values, v) => {
-    return {
-      ...values,
-      ...(v.default && { [v.var]: v.default }),
-    };
-  }, {});
-
-  const exclude = [];
-  commandArgs.forEach((arg, idx) => {
-    if (exclude.includes(idx)) {
-      return;
-    }
-    if (args[arg]) {
-      if (args[arg].type) {
-        vars[args[arg].var] = args[arg].type(commandArgs[idx + 1]);
-        exclude.push(idx + 1);
-      } else {
-        vars[args[arg].var] = true;
-      }
-    }
-  });
-  return vars;
-};
 
 class DigigovCommand extends Command {
   async exec(script, args, config) {

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"1.1.0","commands":{"hello":{"id":"hello","description":"describe the command here","pluginName":"@digigov/cli","pluginType":"core","aliases":[],"examples":["$ digigov hello\nhello world from ./src/hello.ts!\n"],"flags":{},"args":[{"name":"file"}]}}}
+{"version":"1.1.1-rc.10","commands":{"hello":{"id":"hello","description":"describe the command here","pluginName":"@digigov/cli","pluginType":"core","aliases":[],"examples":["$ digigov hello\nhello world from ./src/hello.ts!\n"],"flags":{},"args":[{"name":"file"}]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@digigov/cli",
   "description": "CLI for Digigov apps and libs with plugin support",
-  "version": "1.1.0",
+  "version": "1.1.1-rc.10",
   "author": "GRNET Devs <devs@lists.grnet.gr>",
   "bin": {
     "digigov": "./bin/run"