@qooxdoo/framework 7.9.2 → 8.0.0-beta.1

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

@@ -16,60 +16,70 @@
 
 ************************************************************************ */
 const process = require("process");
-const Search = require("github-api/dist/components/Search");
-const Repository = require("github-api/dist/components/Repository");
+const { Octokit } = require("@octokit/rest");
 const semver = require("semver");
 const inquirer = require("inquirer");
 const path = require("upath");
 
 /**
  * Updates the local cache with information of available library packages
- * @ignore(github.*)
+ *
+ * @ignore(Buffer.from)
  */
-qx.Class.define("qx.tool.cli.commands.package.Update", {
-  extend: qx.tool.cli.commands.Package,
+qx.Class.define("qx.tool.compiler.cli.commands.package.Update", {
+  extend: qx.tool.compiler.cli.commands.Package,
 
   statics: {
-    getYargsCommand() {
-      return {
-        command: "update [repository]",
-        describe:
-          "updates information on packages from github. Has to be called before the other commands. If a package URI is supplied, only update information on that package",
-        builder: {
-          file: {
-            alias: "f",
-            describe: "Output result to a file"
-          },
-
-          search: {
-            alias: "S",
-            describe:
-              "Search GitHub for repos (as opposed to using the cached nightly data)"
-          },
-
-          "all-versions": {
-            alias: "a",
-            describe:
-              "Retrieve all releases (as opposed to the latest minor/patch release of each major release)"
-          },
-
-          verbose: {
-            alias: "v",
-            describe: "Verbose logging"
-          },
-
-          quiet: {
-            alias: "q",
-            describe: "No output"
-          },
-
-          "export-only": {
-            alias: "E",
-            describe:
-              "Export the current cache without updating it first (requires --file)"
-          }
-        }
-      };
+    async createCliCommand(clazz = this) {
+      let cmd = await qx.tool.compiler.cli.Command.createCliCommand(clazz);
+      cmd.set({
+        name: "update",
+        description: "updates information on packages from github. Has to be called before the other commands. If a package URI is supplied, only update information on that package"
+      });
+
+      cmd.addArgument(
+        new qx.tool.cli.Argument("repository").set({
+          description: "repository to update",
+          type: "string"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("file").set({
+          shortCode: "f",
+          description: "Output result to a file",
+          type: "string"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("search").set({
+          shortCode: "S",
+          description: "Search GitHub for repos (as opposed to using the cached nightly data)",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("all-versions").set({
+          shortCode: "a",
+          description: "Retrieve all releases (as opposed to the latest minor/patch release of each major release)",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("export-only").set({
+          shortCode: "E",
+          description: "Export the current cache without updating it first (requires --file)",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      return cmd;
     }
   },
 
@@ -79,14 +89,16 @@ qx.Class.define("qx.tool.cli.commands.package.Update", {
     /**
      * Updates the cache with information from GitHub.
      */
-    async process() {
-      super.process();
-
+    async process(argv = null) {
+      // If called programmatically, set argv from parameter
+      if (argv && !this.argv) {
+        this.argv = argv;
+      }
       // init
       this.__names = [];
 
       // export only
-      if (this.argv.exportOnly) {
+      if (this.argv.exportOnly || false) {
         if (!this.argv.file) {
           qx.tool.compiler.Console.error("Path required via --file argument.");
           process.exit(1);
@@ -99,7 +111,7 @@ qx.Class.define("qx.tool.cli.commands.package.Update", {
         this.clearCache();
       }
 
-      let cfg = await qx.tool.cli.ConfigDb.getInstance();
+      let cfg = await qx.tool.compiler.cli.ConfigDb.getInstance();
       let github = cfg.db("github", {});
 
       // Create the cache
@@ -176,11 +188,9 @@ qx.Class.define("qx.tool.cli.commands.package.Update", {
      * @return {Promise<void>}
      */
     async updateFromGitHubAPI(token) {
-      const auth = {
-        token
-      };
-
-      const search = new Search({}, auth);
+      const octokit = new Octokit({
+        auth: token
+      });
       let num_libraries = 0;
 
       // repositories
@@ -194,13 +204,13 @@ qx.Class.define("qx.tool.cli.commands.package.Update", {
       if (this.argv.repository) {
         query += " " + this.argv.repository;
       }
-      let result = await search.forRepositories({ q: query });
+      let result = await octokit.rest.search.repos({ q: query });
       // backwards-compatibility
       query = "topic:qooxdoo-contrib fork:true";
       if (this.argv.repository) {
         query += " " + this.argv.repository;
       }
-      let result2 = await search.forRepositories({ q: query });
+      let result2 = await octokit.rest.search.repos({ q: query });
       let repos = result.data.concat(result2.data);
       let repo_lookup = {};
 
@@ -222,7 +232,7 @@ qx.Class.define("qx.tool.cli.commands.package.Update", {
           qx.tool.compiler.Console.info(`### Found ${name} ...`);
         }
         this.__names.push(name);
-        let repository = new Repository(name, auth);
+        const [owner, repoName] = name.split('/');
         repos_data[name] = {
           description: repo.description,
           url: repo.url,
@@ -234,7 +244,10 @@ qx.Class.define("qx.tool.cli.commands.package.Update", {
 
         // get releases
         try {
-          var releases_data = await repository.listReleases();
+          var releases_data = await octokit.rest.repos.listReleases({
+            owner,
+            repo: repoName
+          });
         } catch (e) {
           qx.tool.compiler.Console.error("Error retrieving releases: " + e);
           continue;
@@ -290,11 +303,15 @@ qx.Class.define("qx.tool.cli.commands.package.Update", {
           }
           try {
             // @todo check if the method can return JSON to save parsing
-            qooxdoo_data = await repository.getContents(
-              tag_name,
-              "qooxdoo.json",
-              true
-            );
+            let qooxdoo_response = await octokit.rest.repos.getContent({
+              owner,
+              repo: repoName,
+              path: "qooxdoo.json",
+              ref: tag_name
+            });
+            qooxdoo_data = {
+              data: JSON.parse(Buffer.from(qooxdoo_response.data.content, 'base64').toString())
+            };
 
             if (this.argv.verbose) {
               this.debug(`>>>  File exists, checking for libraries...`);
@@ -338,11 +355,15 @@ qx.Class.define("qx.tool.cli.commands.package.Update", {
                   `>>> Retrieving Manifest file '${manifest_path}' for ${name} ${tag_name}...`
                 );
               }
-              manifest_data = await repository.getContents(
-                tag_name,
-                manifest_path,
-                true
-              );
+              let manifest_response = await octokit.rest.repos.getContent({
+                owner,
+                repo: repoName,
+                path: manifest_path,
+                ref: tag_name
+              });
+              manifest_data = {
+                data: JSON.parse(Buffer.from(manifest_response.data.content, 'base64').toString())
+              };
             } catch (e) {
               if (e.message.match(/404/)) {
                 if (this.argv.verbose) {

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

@@ -21,54 +21,67 @@ const semver = require("semver");
 /**
  * Lists compatible library packages
  */
-qx.Class.define("qx.tool.cli.commands.package.Upgrade", {
-  extend: qx.tool.cli.commands.Package,
+qx.Class.define("qx.tool.compiler.cli.commands.package.Upgrade", {
+  extend: qx.tool.compiler.cli.commands.Package,
   statics: {
-    getYargsCommand() {
-      return {
-        command: "upgrade [library_uri]",
-        describe:
-          "if no library URI is given, upgrades all available libraries to the latest compatible version, otherwise upgrade only the package identified by the URI.",
-        builder: {
-          quiet: {
-            alias: "q",
-            describe: "No output"
-          },
-
-          verbose: {
-            alias: "v",
-            describe: "Verbose logging"
-          },
-
-          "releases-only": {
-            alias: "r",
-            describe:
-              "Upgrade regular releases only (this leaves versions based on branches, commits etc. untouched)",
-            default: true
-          },
-
-          reinstall: {
-            alias: "R",
-            describe: "Do not upgrade, reinstall current version"
-          },
-
-          prereleases: {
-            alias: "p",
-            describe: "Use prereleases if available"
-          },
-
-          "dry-run": {
-            alias: "d",
-            describe: "Show result only, do not actually upgrade"
-          },
-
-          "qx-version": {
-            check: argv => semver.valid(argv.qxVersion),
-            describe:
-              "A semver string. If given, the qooxdoo version for which to upgrade the package"
-          }
-        }
-      };
+    async createCliCommand(clazz = this) {
+      let cmd = await qx.tool.compiler.cli.Command.createCliCommand(clazz);
+      cmd.set({
+        name: "upgrade",
+        description: "if no library URI is given, upgrades all available libraries to the latest compatible version, otherwise upgrade only the package identified by the URI."
+      });
+
+      cmd.addArgument(
+        new qx.tool.cli.Argument("library_uri").set({
+          description: "library URI to upgrade",
+          type: "string"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("releases-only").set({
+          shortCode: "r",
+          description: "Upgrade regular releases only (this leaves versions based on branches, commits etc. untouched)",
+          type: "boolean",
+          value: true
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("reinstall").set({
+          shortCode: "R",
+          description: "Do not upgrade, reinstall current version",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("prereleases").set({
+          shortCode: "p",
+          description: "Use prereleases if available",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("dry-run").set({
+          shortCode: "d",
+          description: "Show result only, do not actually upgrade",
+          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 upgrade the package",
+          type: "string"
+        })
+      );
+
+      return cmd;
     }
   },
 
@@ -78,17 +91,16 @@ qx.Class.define("qx.tool.cli.commands.package.Upgrade", {
      * @return {Promise<void>}
      */
     async process() {
-      await super.process();
       let qxVersion = await this.getAppQxVersion();
-      await new qx.tool.cli.commands.package.Update({
+      await new qx.tool.compiler.cli.commands.package.Update().process({
         quiet: true,
         prereleases: this.argv.prereleases
-      }).process();
-      await new qx.tool.cli.commands.package.List({
+      });
+      await new qx.tool.compiler.cli.commands.package.List().process({
         quiet: true,
         prereleases: this.argv.prereleases,
         qxVersion
-      }).process();
+      });
       if (!this.argv.quiet) {
         qx.tool.compiler.Console.info(
           `Upgrading project dependencies to the latest available release for qooxdoo version ${qxVersion}:`
@@ -96,11 +108,12 @@ qx.Class.define("qx.tool.cli.commands.package.Upgrade", {
       }
       let data = await this.getLockfileData();
       let found = false;
-      const installer = new qx.tool.cli.commands.package.Install({
+      const installer = new qx.tool.compiler.cli.commands.package.Install();
+      installer.argv = {
         quiet: this.argv.quiet,
         verbose: this.argv.verbose,
         qxVersion
-      });
+      };
 
       for (const library of data.libraries) {
         // do not upggrade libraries that are not from a repository

package/source/class/qx/tool/compiler/makers/AbstractAppMaker.js

@@ -32,7 +32,8 @@ qx.Class.define("qx.tool.compiler.makers.AbstractAppMaker", {
     target: {
       nullable: false,
       check: "qx.tool.compiler.targets.Target",
-      apply: "__applyTarget"
+      apply: "__applyTarget",
+      init: null
     },
 
     /** Supported Locales */

package/source/class/qx/tool/compiler/resources/Manager.js

@@ -54,6 +54,8 @@ qx.Class.define("qx.tool.compiler.resources.Manager", {
   },
 
   members: {
+    __assets: undefined,
+
     /** {String} filename of database */
     __dbFilename: null,
 

package/source/class/qx/tool/compiler/resources/ScssConverter.js

@@ -23,7 +23,7 @@
 
 const path = require("upath");
 /**
- * @external(qx/tool/loadsass.js)
+ * @external(qx/tool/compiler/loadsass.js)
  * @ignore(loadSass)
  */
 /* global loadSass */

package/source/class/qx/tool/compiler/resources/ScssFile.js

@@ -24,7 +24,7 @@
 const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");
 /**
- * @external(qx/tool/loadsass.js)
+ * @external(qx/tool/compiler/loadsass.js)
  * @ignore(loadSass)
  */
 /* global loadSass */

package/source/class/qx/tool/compiler/targets/Target.js

@@ -522,8 +522,8 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
       var assetUris = application.getAssetUris(t, rm, appMeta.getEnvironment()); // Save any changes that getAssets collected
       await rm.saveDatabase();
 
-      let cldr = await analyser.getCldr("en");
-      await bootPackage.addLocale("C", cldr);
+      let localeOptions = await analyser.getLocale("en");
+      await bootPackage.addLocale("C", localeOptions);
       await this._writeTranslations();
 
       var assets = {};
@@ -785,7 +785,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
         var combinedCldr = null;
 
         function accumulateCldr(localeId) {
-          return analyser.getCldr(localeId).then(cldr => {
+          return analyser.getLocale(localeId).then(cldr => {
             if (!combinedCldr) {
               combinedCldr = cldr;
             } else {
@@ -796,11 +796,6 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
                 }
               }
             }
-            var parentLocaleId =
-              qx.tool.compiler.app.Cldr.getParentLocale(localeId);
-            if (parentLocaleId) {
-              return accumulateCldr(parentLocaleId);
-            }
             return combinedCldr;
           });
         }
@@ -809,11 +804,11 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
       }
 
       var promises = t.getLocales().map(async localeId => {
-        let cldr = await loadLocaleData(localeId);
+        let localeOptions = await loadLocaleData(localeId);
         let pkg = this.isI18nAsParts()
           ? appMeta.getLocalePackage(localeId)
           : bootPackage;
-        pkg.addLocale(localeId, cldr);
+        pkg.addLocale(localeId, localeOptions);
       });
 
       await qx.Promise.all(promises);

package/source/class/qx/tool/compiler/targets/TypeScriptWriter.js

@@ -487,7 +487,11 @@ qx.Class.define("qx.tool.compiler.targets.TypeScriptWriter", {
 
       typename = typename.replace("Promise<", "globalThis.Promise<");
       typename = typename.replace(
-        /(^|[^.a-zA-Z])(var|\*)([^.a-zA-Z]|$)/g,
+        /(^|[^.a-zA-Z])(var)([^.a-zA-Z]|$)/g,
+        "$1unknown$3"
+      );
+      typename = typename.replace(
+        /(^|[^.a-zA-Z])(\*)([^.a-zA-Z]|$)/g,
         "$1any$3"
       );
 
@@ -841,7 +845,7 @@ qx.Class.define("qx.tool.compiler.targets.TypeScriptWriter", {
       Array: "Array<any>",
       RegEx: "RegExp",
       // TODO: deprecate the below types as they are non-standard aliases for builtin types without any tangible benefit
-      var: "any",
+      var: "unknown",
       "*": "any",
       arguments: "any"
     }

package/source/class/qx/tool/compiler/targets/meta/ApplicationMeta.js

@@ -64,10 +64,6 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
       check: "Boolean"
     },
 
-    appLibrary: {
-      check: "qx.tool.compiler.app.Library"
-    },
-
     bootMetaJs: {
       check: "qx.tool.compiler.targets.meta.AbstractJavascriptMeta"
     },
@@ -82,6 +78,8 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
   },
 
   members: {
+    __partsLookup : undefined,
+
     /** {qx.tool.compiler.targets.Target} the target */
     __target: null,
 

package/source/class/qx/tool/compiler/targets/meta/BootJs.js

@@ -43,6 +43,8 @@ qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
   },
 
   members: {
+    __embeddedJsLookup : undefined,
+
     __embeddedJs: null,
     __sourceMapOffsets: null,
 

package/source/class/qx/tool/compiler/targets/meta/PackageJavascript.js

@@ -50,6 +50,8 @@ qx.Class.define("qx.tool.compiler.targets.meta.PackageJavascript", {
   },
 
   members: {
+    __pkg : undefined,
+    
     __sourceMapOffsets: null,
 
     /*

package/source/class/qx/tool/config/Abstract.js

@@ -217,7 +217,7 @@ qx.Class.define("qx.tool.config.Abstract", {
      */
     getSchemaPath() {
       return qx.util.ResourceManager.getInstance().toUri(
-        `qx/tool/schema/${this._getSchemaFileName()}`
+        `qx/tool/compiler/schema/${this._getSchemaFileName()}`
       );
     },
 
@@ -364,7 +364,7 @@ qx.Class.define("qx.tool.config.Abstract", {
       let originalValue = this.getValue(prop_path, options);
       set_value(this.getData(), prop_path, value, { preservePaths: false });
       try {
-        this.validate();
+        this._validate();
       } catch (e) {
         // revert change
         if (originalValue === undefined) {
@@ -391,7 +391,7 @@ qx.Class.define("qx.tool.config.Abstract", {
       let originalValue = this.getValue(prop_path, options);
       unset_value(this.getData(), prop_path);
       try {
-        this.validate();
+        this._validate();
       } catch (e) {
         // revert value
         set_value(this.getData(), prop_path, originalValue, {
@@ -451,7 +451,7 @@ qx.Class.define("qx.tool.config.Abstract", {
      * Validates the stored config model data. Used when data is changed
      * outside of the API. Will not validate if validate property is false.
      */
-    validate() {
+    _validate() {
       this._validateData(this.getData());
     },
 
@@ -460,7 +460,7 @@ qx.Class.define("qx.tool.config.Abstract", {
      * @return {Promise<void>}
      */
     async save() {
-      this.validate();
+      this._validate();
       await qx.tool.utils.Json.saveJsonAsync(
         this.getDataPath(),
         this.getData()

package/source/class/qx/tool/config/Lockfile.js

@@ -25,7 +25,7 @@ qx.Class.define("qx.tool.config.Lockfile", {
   type: "singleton",
   statics: {
     config: {
-      fileName: qx.tool.cli.commands.Package.lockfile.filename,
+      fileName: qx.tool.compiler.cli.commands.Package.lockfile.filename,
       version,
       validate: false,
       createIfNotExists: true,

package/source/class/qx/tool/migration/BaseMigration.js

@@ -19,7 +19,7 @@
 const process = require("process");
 const fs = qx.tool.utils.Promisify.fs;
 const fsp = require("fs").promises;
-const replaceInFile = require("replace-in-file");
+const { replaceInFile } = require("replace-in-file");
 const semver = require("semver");
 
 /**
@@ -190,11 +190,13 @@ qx.Class.define("qx.tool.migration.BaseMigration", {
     async checkFilesContain(files, text) {
       files = Array.isArray(files) ? files : [files];
       for (let file of files) {
-        if (
-          (await fsp.stat(file)).isFile() &&
-          (await fsp.readFile(file, "utf8")).includes(text)
-        ) {
-          return true;
+        if ((await fsp.stat(file)).isFile()) {
+          let content = await fsp.readFile(file, "utf8");
+          // Handle both regex patterns and strings
+          let matches = text instanceof RegExp ? text.test(content) : content.includes(text);
+          if (matches) {
+            return true;
+          }
         }
       }
       return false;
@@ -331,7 +333,7 @@ qx.Class.define("qx.tool.migration.BaseMigration", {
           qxVersion: runner.getQxVersion()
         };
 
-        await new qx.tool.cli.commands.package.Upgrade(options).process();
+        await new qx.tool.compiler.cli.commands.package.Upgrade().process(options);
         this.markAsApplied();
       }
     }

package/source/class/qx/tool/migration/M6_0_0.js

@@ -67,7 +67,7 @@ qx.Class.define("qx.tool.migration.M6_0_0", {
 
     async migrateConfigFiles() {
       let dryRun = this.getRunner().getDryRun();
-      let pkg = qx.tool.cli.commands.Package;
+      let pkg = qx.tool.compiler.cli.commands.Package;
       let cwd = process.cwd();
       // rename configuration files from initial names
       // replace those static variables with verbatims
@@ -76,11 +76,11 @@ qx.Class.define("qx.tool.migration.M6_0_0", {
         [path.join(cwd, pkg.cache_dir), path.join(cwd, "contrib")],
         [
           path.join(
-            qx.tool.cli.ConfigDb.getDirectory(),
+            qx.tool.compiler.cli.ConfigDb.getDirectory(),
             pkg.package_cache_name
           ),
 
-          path.join(qx.tool.cli.ConfigDb.getDirectory(), "contrib-cache.json")
+          path.join(qx.tool.compiler.cli.ConfigDb.getDirectory(), "contrib-cache.json")
         ]
       ];