@qooxdoo/framework 7.9.1 → 8.0.0-beta.1

package/source/class/qx/tool/{cli → compiler/cli}/commands/config/Set.js

@@ -16,33 +16,41 @@
    * Henner Kollmann (Henner.Kollmann@gmx.de, @hkollmann)
 
 ************************************************************************ */
-qx.Class.define("qx.tool.cli.commands.config.Set", {
-  extend: qx.tool.cli.commands.Config,
+qx.Class.define("qx.tool.compiler.cli.commands.config.Set", {
+  extend: qx.tool.compiler.cli.commands.Config,
   statics: {
-    /**
-     * Returns the yargs command data
-     * @return {Object}
-     */
-    getYargsCommand() {
-      return {
-        command: "set <key> <value>",
-        describe: "Sets a configuration value",
-        builder: {
-          all: {
-            type: "boolean",
-            describe: "Shows all keys, including unset"
-          }
-        }
-      };
+    async createCliCommand(clazz = this) {
+      let cmd = await qx.tool.compiler.cli.Command.createCliCommand(clazz);
+      cmd.set({
+        name: "set",
+        description: "Sets a configuration value"
+      });
+
+      cmd.addArgument(
+        new qx.tool.cli.Argument("key").set({
+          description: "Configuration key to set",
+          required: true,
+          type: "string"
+        })
+      );
+
+      cmd.addArgument(
+        new qx.tool.cli.Argument("value").set({
+          description: "Configuration value to set",
+          required: true,
+          type: "string"
+        })
+      );
+
+      return cmd;
     }
   },
 
   members: {
     async process() {
-      await super.process();
       this._checkKey(this.argv);
-      let cfg = await qx.tool.cli.ConfigDb.getInstance();
-      let setting = qx.tool.cli.commands.Config.KNOWN_VALUES[this.argv.key];
+      let cfg = await qx.tool.compiler.cli.ConfigDb.getInstance();
+      let setting = qx.tool.compiler.cli.commands.Config.KNOWN_VALUES[this.argv.key];
       let value = this.argv.value;
       if (setting && typeof setting.set == "function") {
         value = await setting.set(value);

package/source/class/qx/tool/{cli → compiler/cli}/commands/package/Install.js

@@ -16,76 +16,86 @@
 
 ************************************************************************ */
 
-const download = require("download");
+const AdmZip = require("adm-zip");
 const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");
 const process = require("process");
 const semver = require("semver");
-const rimraf = require("rimraf");
 
 /**
- * Installs a package
+ *  Installs a package
  */
-qx.Class.define("qx.tool.cli.commands.package.Install", {
-  extend: qx.tool.cli.commands.Package,
+/**
+ * @ignore(fetch)
+ * @ignore(Buffer.from)
+ */
+qx.Class.define("qx.tool.compiler.cli.commands.package.Install", {
+  extend: qx.tool.compiler.cli.commands.Package,
 
   statics: {
     /**
-     * Yarg commands data
-     * @return {{}}
+     * Creates CLI command
      */
-    getYargsCommand() {
-      return {
-        command: "install [uri[@release_tag]]",
-        describe: `installs the latest compatible release of package (as per Manifest.json). Use "-r <release tag>" or @<release tag> to install a particular release.
+    async createCliCommand(clazz = this) {
+      let cmd = await qx.tool.compiler.cli.Command.createCliCommand(clazz);
+      cmd.set({
+        name: "install",
+        description: `installs the latest compatible release of package (as per Manifest.json). Use "-r <release tag>" or @<release tag> to install a particular release.
         examples:
            * qx package install name: Install latest published version
            * qx package install name@v0.0.2: Install version 0.0.2,
-           * qx package install name@master: Install current master branch from github`,
-        builder: {
-          release: {
-            alias: "r",
-            describe:
-              "Use a specific release tag instead of the tag of the latest compatible release",
-            nargs: 1,
-            requiresArg: true,
-            type: "string"
-          },
-
-          ignore: {
-            alias: "i",
-            describe: "Ignore unmatch of qooxdoo"
-          },
-
-          verbose: {
-            alias: "v",
-            describe: "Verbose logging"
-          },
-
-          quiet: {
-            alias: "q",
-            describe: "No output"
-          },
-
-          save: {
-            alias: "s",
-            default: false,
-            describe: "Save the libraries as permanent dependencies"
-          },
-
-          "from-path": {
-            alias: "p",
-            nargs: 1,
-            describe: "Install a library/the given library from a local path"
-          },
-
-          "qx-version": {
-            check: argv => semver.valid(argv.qxVersion),
-            describe:
-              "A semver string. If given, the maximum qooxdoo version for which to install a package"
-          }
-        }
-      };
+           * qx package install name@master: Install current master branch from github`
+      });
+
+      cmd.addArgument(
+        new qx.tool.cli.Argument("uri").set({
+          description: "Package URI with optional @release_tag",
+          type: "string"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("release").set({
+          shortCode: "r",
+          description: "Use a specific release tag instead of the tag of the latest compatible release",
+          type: "string"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("ignore").set({
+          shortCode: "i",
+          description: "Ignore unmatch of qooxdoo",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("save").set({
+          shortCode: "s",
+          description: "Save the libraries as permanent dependencies",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("from-path").set({
+          shortCode: "p",
+          description: "Install a library/the given library from a local path",
+          type: "string"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("qx-version").set({
+          description: "A semver string. If given, the maximum qooxdoo version for which to install a package",
+          type: "string"
+        })
+      );
+
+      return cmd;
     }
   },
 
@@ -123,8 +133,7 @@ qx.Class.define("qx.tool.cli.commands.package.Install", {
       }
       if (this.argv.verbose) {
         qx.tool.compiler.Console.info(
-          `>>> To be installed: ${
-            library_uri || "local libarary"
+          `>>> To be installed: ${library_uri || "local libarary"
           } from ${local_path}`
         );
       }
@@ -152,13 +161,18 @@ qx.Class.define("qx.tool.cli.commands.package.Install", {
     /**
      * Installs a package
      */
-    async process() {
-      await super.process();
+    async process(argv = null) {
+      // If called programmatically, set argv from parameter
+      if (argv && !this.argv) {
+        this.argv = argv;
+      }
       await this.__updateCache();
       const [manifestModel, lockfileModel] = await this._getConfigData();
 
       // create shorthand for uri@id
-      this.argv.uri = this.argv.uri || this.argv["uri@release_tag"];
+      if (this.argv) {
+        this.argv.uri = this.argv.uri || this.argv["uri@release_tag"];
+      }
 
       // if no library uri has been passed, install from lockfile or manifest
 
@@ -212,6 +226,61 @@ qx.Class.define("qx.tool.cli.commands.package.Install", {
         qx.tool.compiler.Console.info(">>> Done.");
       }
     },
+/**
+ * Download and extract a ZIP archive using native fetch
+ * @param {string} url - URL to download
+ * @param {string} destination - Destination directory
+ * @param {object} options - Options object
+ * @param {boolean} options.extract - Whether to extract the archive
+ * @param {number} options.strip - Number of directory levels to strip
+ */
+async __downloadAndExtract(url, destination, options = {}) {
+  const response = await fetch(url);
+  
+  if (!response.ok) {
+    throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+  }
+  
+  const arrayBuffer = await response.arrayBuffer();
+  const buffer = Buffer.from(arrayBuffer);
+  
+  if (options.extract) {
+    const zip = new AdmZip(buffer);
+    const entries = zip.getEntries();
+    
+    // Create destination directory if it doesn't exist
+    await fs.mkdirAsync(destination, { recursive: true });
+    
+    // Extract with strip support
+    for (const entry of entries) {
+      if (!entry.isDirectory) {
+        let entryPath = entry.entryName;
+        
+        // Strip directories if requested
+        if (options.strip && options.strip > 0) {
+          const pathParts = entryPath.split('/');
+          if (pathParts.length > options.strip) {
+            entryPath = pathParts.slice(options.strip).join('/');
+          } else {
+            continue; // Skip if not enough path parts
+          }
+        }
+        
+        const outputPath = path.join(destination, entryPath);
+        const outputDir = path.dirname(outputPath);
+        
+        // Create directory structure
+        await fs.mkdirAsync(outputDir, { recursive: true });
+        
+        // Write file
+        await fs.writeFileAsync(outputPath, entry.getData());
+      }
+    }
+  } else {
+    // Just save the ZIP file
+    await fs.writeFile(destination, buffer);
+  }
+},
 
     /**
      * Update repo cache
@@ -226,10 +295,8 @@ qx.Class.define("qx.tool.cli.commands.package.Install", {
         }
         this.clearCache();
         // implicit update
-        await new qx.tool.cli.commands.package.Update({
-          quiet: true
-        }).process();
-        await new qx.tool.cli.commands.package.List({ quiet: true }).process();
+        await new qx.tool.compiler.cli.commands.package.Update().process({ quiet: true });
+        await new qx.tool.compiler.cli.commands.package.List().process({ quiet: true });
       }
     },
 
@@ -280,7 +347,7 @@ qx.Class.define("qx.tool.cli.commands.package.Install", {
             qx.tool.compiler.Console.info(">>> Updating cache...");
           }
           let options = { quiet: true, all: true, qxVersion };
-          await new qx.tool.cli.commands.package.List(options).process();
+          await new qx.tool.compiler.cli.commands.package.List().process(options);
           cache = this.getCache(true);
         }
         tag_name =
@@ -464,8 +531,7 @@ qx.Class.define("qx.tool.cli.commands.package.Install", {
         lockfileModel.setValue(["libraries", index], lib);
         if (this.argv.verbose) {
           qx.tool.compiler.Console.info(
-            `>>> Updating already existing lockfile entry for ${info.name}, ${
-              info.version
+            `>>> Updating already existing lockfile entry for ${info.name}, ${info.version
             }, installed from '${uri ? uri : local_path}'.`
           );
         }
@@ -473,8 +539,7 @@ qx.Class.define("qx.tool.cli.commands.package.Install", {
         lockfileModel.transform("libraries", libs => libs.push(lib) && libs);
         if (this.argv.verbose) {
           qx.tool.compiler.Console.info(
-            `>>> Added new lockfile entry for ${info.name}, ${
-              info.version
+            `>>> Added new lockfile entry for ${info.name}, ${info.version
             }, installed from '${uri ? uri : local_path}'.`
           );
         }
@@ -674,8 +739,8 @@ qx.Class.define("qx.tool.cli.commands.package.Install", {
       if (!(await compileConfigModel.exists())) {
         qx.tool.compiler.Console.info(
           ">>> Cannot install application " +
-            (manifestApp.name || manifestApp["class"]) +
-            " because compile.json does not exist (you must manually add it)"
+          (manifestApp.name || manifestApp["class"]) +
+          " because compile.json does not exist (you must manually add it)"
         );
 
         return false;
@@ -744,7 +809,7 @@ qx.Class.define("qx.tool.cli.commands.package.Install", {
       let dir_name = `${repo_name}_${treeish}`.replace(/[\^./*?"'<>:]/g, "_");
       let parts = [
         process.cwd(),
-        qx.tool.cli.commands.Package.cache_dir,
+        qx.tool.compiler.cli.commands.Package.cache_dir,
         dir_name
       ];
 
@@ -773,7 +838,7 @@ qx.Class.define("qx.tool.cli.commands.package.Install", {
           );
         }
         try {
-          await download(url, download_path, { extract: true, strip: 1 });
+          await this.__downloadAndExtract(url, download_path, { extract: true, strip: 1 });
         } catch (e) {
           // remove download path so that failed downloads do not result in empty folder
           if (this.argv.verbose) {
@@ -781,7 +846,7 @@ qx.Class.define("qx.tool.cli.commands.package.Install", {
               `>>> Download failed: ${e.message}. Removing download folder.`
             );
           }
-          rimraf.sync(download_path);
+          await qx.tool.utils.files.Utils.deleteRecursive(download_path);
           qx.tool.compiler.Console.error(
             `Could not install '${repo_name}@${treeish}'. Use the --verbose flag for more information.`
           );

package/source/class/qx/tool/{cli → compiler/cli}/commands/package/List.js

@@ -22,8 +22,8 @@ const path = require("upath");
 /**
  * Lists compatible packages
  */
-qx.Class.define("qx.tool.cli.commands.package.List", {
-  extend: qx.tool.cli.commands.Package,
+qx.Class.define("qx.tool.compiler.cli.commands.package.List", {
+  extend: qx.tool.compiler.cli.commands.Package,
   statics: {
     /**
      * The name of a "fake" repository containing libraries from local paths
@@ -31,83 +31,119 @@ qx.Class.define("qx.tool.cli.commands.package.List", {
     localPathRepoName: "_local_",
 
     /**
-     * Returns the yargs command data
-     * @return {Object}
+     * Creates CLI command
      */
-    getYargsCommand() {
-      return {
-        command: "list [repository]",
-        describe:
-          'if no repository name is given, lists all available packages that are compatible with the project\'s qooxdoo version ("--all" lists incompatible ones as well). Otherwise, list all compatible packages.',
-        builder: {
-          all: {
-            alias: "a",
-            describe: "Show all versions, including incompatible ones"
-          },
-
-          verbose: {
-            alias: "v",
-            describe: "Verbose logging"
-          },
-
-          quiet: {
-            alias: "q",
-            describe: "No output"
-          },
-
-          json: {
-            alias: "j",
-            describe: "Output list as JSON literal"
-          },
-
-          installed: {
-            alias: "i",
-            describe: "Show only installed libraries"
-          },
-
-          namespace: {
-            alias: "n",
-            describe: "Display library namespace"
-          },
-
-          match: {
-            alias: "m",
-            describe: "Filter by regular expression (case-insensitive)"
-          },
-
-          libraries: {
-            alias: "l",
-            describe: "List libraries only (no repositories)"
-          },
-
-          short: {
-            alias: "s",
-            describe: "Omit title and description to make list more compact"
-          },
-
-          noheaders: {
-            alias: "H",
-            describe: "Omit header and footer"
-          },
-
-          prereleases: {
-            alias: "p",
-            describe: "Include prereleases into latest compatible releases"
-          },
-
-          "uris-only": {
-            alias: "u",
-            describe:
-              "Output only the GitHub URIs of the packages which are used to install the packages. Implies --noheaders and --libraries."
-          },
+    async createCliCommand(clazz = this) {
+      let cmd = await qx.tool.compiler.cli.Command.createCliCommand(clazz);
+      cmd.set({
+        name: "list",
+        description: 'if no repository name is given, lists all available packages that are compatible with the project\'s qooxdoo version ("--all" lists incompatible ones as well). Otherwise, list all compatible packages.'
+      });
 
-          "qx-version": {
-            check: argv => semver.valid(argv.qxVersion),
-            describe:
-              "A semver string. If given, the qooxdoo version for which to generate the listings"
-          }
-        }
-      };
+      cmd.addArgument(
+        new qx.tool.cli.Argument("repository").set({
+          description: "repository name",
+          type: "string"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("all").set({
+          shortCode: "a",
+          description: "Show all versions, including incompatible ones",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("json").set({
+          shortCode: "j",
+          description: "Output list as JSON literal",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("installed").set({
+          shortCode: "i",
+          description: "Show only installed libraries",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("namespace").set({
+          shortCode: "n",
+          description: "Display library namespace",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("match").set({
+          shortCode: "m",
+          description: "Filter by regular expression (case-insensitive)",
+          type: "string"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("libraries").set({
+          shortCode: "l",
+          description: "List libraries only (no repositories)",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("short").set({
+          shortCode: "s",
+          description: "Omit title and description to make list more compact",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("noheaders").set({
+          shortCode: "H",
+          description: "Omit header and footer",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("prereleases").set({
+          shortCode: "p",
+          description: "Include prereleases into latest compatible releases",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("uris-only").set({
+          shortCode: "u",
+          description: "Output only the GitHub URIs of the packages which are used to install the packages. Implies --noheaders and --libraries.",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("qx-version").set({
+          description: "A semver string. If given, the qooxdoo version for which to generate the listings",
+          type: "string"
+        })
+      );
+
+      return cmd;
     }
   },
 
@@ -115,8 +151,11 @@ qx.Class.define("qx.tool.cli.commands.package.List", {
     /**
      * Lists library packages compatible with the current project
      */
-    async process() {
-      await super.process();
+    async process(argv = null) {
+      // If called programmatically, set argv from parameter
+      if (argv && !this.argv) {
+        this.argv = argv;
+      }
       this.__repositories = [];
       this.__libraries = {};
       this.__latestCompatible = {};
@@ -126,7 +165,7 @@ qx.Class.define("qx.tool.cli.commands.package.List", {
 
       // implicit qx package update, disabled
       // if (repos_cache.list.length === 0 || this.getCache().version !== qx.tool.config.Lockfile.getInstance().getVersion()) {
-      //   await (new qx.tool.cli.commands.package.Update({quiet:true})).process();
+      //   await new qx.tool.compiler.cli.commands.package.Update().process({quiet:true});
       // }
 
       let qxVersion;