@nzz/q-cli 1.9.0 → 1.9.2

package/.history/bin/commands/qItem/updateItem/updateItem_20221105174010.js

@@ -0,0 +1,74 @@
+const schemaService = require("./../schemaService.js");
+const configStore = require("./../configStore.js");
+const itemService = require("./../itemService.js");
+const fs = require("fs");
+const path = require("path");
+const chalk = require("chalk");
+const errorColor = chalk.red;
+const successColor = chalk.green;
+
+module.exports = async function (command) {
+  try {
+    const qConfigPath = path.resolve(command.config);
+    if (fs.existsSync(qConfigPath)) {
+      const qConfig = JSON.parse(fs.readFileSync(qConfigPath));
+      console.log("----------------")
+      console.log(JSON.stringify(qConfig))
+      const validationResult = schemaService.validateConfig(qConfig);
+      console.log(validationResult)
+
+      console.log("----------------")
+      if (validationResult.isValid) {
+        const config = await configStore.setupStore(
+          qConfig,
+          command.environment,
+          command.reset
+        );
+
+        for (const item of itemService.getItems(qConfig, command.environment)) {
+          for (const environment of item.environments) {
+            const result = await itemService.updateItem(
+              item.item,
+              environment,
+              config,
+              qConfigPath
+            );
+
+            if (result) {
+              console.log(
+                successColor(
+                  `--------------------`
+                )
+              );
+
+              console.log(
+                successColor(
+                  `Successfully updated item with id ${environment.id} on ${environment.name} environment`
+                )
+              );
+            }
+          }
+        }
+      } else {
+        console.error(
+          errorColor(
+            `A problem occured while validating the config file: ${validationResult.errorsText}`
+          )
+        );
+        process.exit(1);
+      }
+    } else {
+      console.error(
+        errorColor(
+          "Couldn't find config file named q.config.json in the current directory. Create a config file in the current directory or pass the path to the config file with the option -c <path>"
+        )
+      );
+    }
+  } catch (error) {
+    console.error(
+      errorColor(
+        `A problem occured while parsing the config file at ${command.config}. Please make sure it is valid JSON.`
+      )
+    );
+  }
+};

package/.history/bin/commands/qItem/updateItem/updateItem_20221105174054.js

@@ -0,0 +1,75 @@
+const schemaService = require("./../schemaService.js");
+const configStore = require("./../configStore.js");
+const itemService = require("./../itemService.js");
+const fs = require("fs");
+const path = require("path");
+const chalk = require("chalk");
+const errorColor = chalk.red;
+const successColor = chalk.green;
+
+module.exports = async function (command) {
+  try {
+    const qConfigPath = path.resolve(command.config);
+    if (fs.existsSync(qConfigPath)) {
+      const qConfig = JSON.parse(fs.readFileSync(qConfigPath));
+      console.log("----------------")
+      console.log(JSON.stringify(qConfig))
+      const validationResult = schemaService.validateConfig(qConfig);
+      console.log(validationResult)
+
+      console.log("----------------")
+      if (validationResult.isValid) {
+        const config = await configStore.setupStore(
+          qConfig,
+          command.environment,
+          command.reset
+        );
+
+        for (const item of itemService.getItems(qConfig, command.environment)) {
+          for (const environment of item.environments) {
+            const result = await itemService.updateItem(
+              item.item,
+              environment,
+              config,
+              qConfigPath
+            );
+            console.log(JSON.stringify(result))
+
+            if (result) {
+              console.log(
+                successColor(
+                  `--------------------`
+                )
+              );
+
+              console.log(
+                successColor(
+                  `Successfully updated item with id ${environment.id} on ${environment.name} environment`
+                )
+              );
+            }
+          }
+        }
+      } else {
+        console.error(
+          errorColor(
+            `A problem occured while validating the config file: ${validationResult.errorsText}`
+          )
+        );
+        process.exit(1);
+      }
+    } else {
+      console.error(
+        errorColor(
+          "Couldn't find config file named q.config.json in the current directory. Create a config file in the current directory or pass the path to the config file with the option -c <path>"
+        )
+      );
+    }
+  } catch (error) {
+    console.error(
+      errorColor(
+        `A problem occured while parsing the config file at ${command.config}. Please make sure it is valid JSON.`
+      )
+    );
+  }
+};

package/.history/package_20220808135115.json

@@ -0,0 +1,43 @@
+{
+  "name": "@nzz/q-cli",
+  "version": "1.9.0",
+  "description": "Cli tool to setup new Q tools, new Q server implementations and start Q dev server to test developing Q tools",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/nzzdev/Q-cli.git"
+  },
+  "bin": {
+    "Q": "bin/q.js"
+  },
+  "author": "",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/nzzdev/Q-cli/issues"
+  },
+  "homepage": "https://github.com/nzzdev/Q-cli#readme",
+  "dependencies": {
+    "@hapi/boom": "^9.1.1",
+    "@hapi/hapi": "^20.1.3",
+    "@hapi/inert": "^6.0.3",
+    "@hapi/mimos": "^5.0.0",
+    "@hapi/vision": "^6.1.0",
+    "@hapi/wreck": "^17.1.0",
+    "ajv": "^6.12.6",
+    "chalk": "^4.1.1",
+    "commander": "^5.1.0",
+    "configstore": "^5.0.1",
+    "deepmerge": "^4.2.2",
+    "form-data": "^3.0.0",
+    "fs-extra": "^9.0.1",
+    "image-size": "^0.8.3",
+    "joi": "^17.4.0",
+    "node-fetch": "^2.6.1",
+    "nunjucks": "^3.2.2",
+    "promptly": "^3.2.0",
+    "replace-in-file": "^3.4.4"
+  }
+}

package/.history/package_20221105171707.json

@@ -0,0 +1,43 @@
+{
+  "name": "@nzz/q-cli",
+  "version": "1.9.1",
+  "description": "Cli tool to setup new Q tools, new Q server implementations and start Q dev server to test developing Q tools",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/nzzdev/Q-cli.git"
+  },
+  "bin": {
+    "Q": "bin/q.js"
+  },
+  "author": "",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/nzzdev/Q-cli/issues"
+  },
+  "homepage": "https://github.com/nzzdev/Q-cli#readme",
+  "dependencies": {
+    "@hapi/boom": "^9.1.1",
+    "@hapi/hapi": "^20.1.3",
+    "@hapi/inert": "^6.0.3",
+    "@hapi/mimos": "^5.0.0",
+    "@hapi/vision": "^6.1.0",
+    "@hapi/wreck": "^17.1.0",
+    "ajv": "^6.12.6",
+    "chalk": "^4.1.1",
+    "commander": "^5.1.0",
+    "configstore": "^5.0.1",
+    "deepmerge": "^4.2.2",
+    "form-data": "^3.0.0",
+    "fs-extra": "^9.0.1",
+    "image-size": "^0.8.3",
+    "joi": "^17.4.0",
+    "node-fetch": "^2.6.1",
+    "nunjucks": "^3.2.2",
+    "promptly": "^3.2.0",
+    "replace-in-file": "^3.4.4"
+  }
+}

package/.history/package_20221105173355.json

@@ -0,0 +1,43 @@
+{
+  "name": "@nzz/q-cli",
+  "version": "333.9.1",
+  "description": "Cli tool to setup new Q tools, new Q server implementations and start Q dev server to test developing Q tools",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/nzzdev/Q-cli.git"
+  },
+  "bin": {
+    "Q": "bin/q.js"
+  },
+  "author": "",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/nzzdev/Q-cli/issues"
+  },
+  "homepage": "https://github.com/nzzdev/Q-cli#readme",
+  "dependencies": {
+    "@hapi/boom": "^9.1.1",
+    "@hapi/hapi": "^20.1.3",
+    "@hapi/inert": "^6.0.3",
+    "@hapi/mimos": "^5.0.0",
+    "@hapi/vision": "^6.1.0",
+    "@hapi/wreck": "^17.1.0",
+    "ajv": "^6.12.6",
+    "chalk": "^4.1.1",
+    "commander": "^5.1.0",
+    "configstore": "^5.0.1",
+    "deepmerge": "^4.2.2",
+    "form-data": "^3.0.0",
+    "fs-extra": "^9.0.1",
+    "image-size": "^0.8.3",
+    "joi": "^17.4.0",
+    "node-fetch": "^2.6.1",
+    "nunjucks": "^3.2.2",
+    "promptly": "^3.2.0",
+    "replace-in-file": "^3.4.4"
+  }
+}

package/.history/package_20221107112303.json

@@ -0,0 +1,43 @@
+{
+  "name": "@nzz/q-cli",
+  "version": "1.9.2",
+  "description": "Cli tool to setup new Q tools, new Q server implementations and start Q dev server to test developing Q tools",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/nzzdev/Q-cli.git"
+  },
+  "bin": {
+    "Q": "bin/q.js"
+  },
+  "author": "",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/nzzdev/Q-cli/issues"
+  },
+  "homepage": "https://github.com/nzzdev/Q-cli#readme",
+  "dependencies": {
+    "@hapi/boom": "^9.1.1",
+    "@hapi/hapi": "^20.1.3",
+    "@hapi/inert": "^6.0.3",
+    "@hapi/mimos": "^5.0.0",
+    "@hapi/vision": "^6.1.0",
+    "@hapi/wreck": "^17.1.0",
+    "ajv": "^6.12.6",
+    "chalk": "^4.1.1",
+    "commander": "^5.1.0",
+    "configstore": "^5.0.1",
+    "deepmerge": "^4.2.2",
+    "form-data": "^3.0.0",
+    "fs-extra": "^9.0.1",
+    "image-size": "^0.8.3",
+    "joi": "^17.4.0",
+    "node-fetch": "^2.6.1",
+    "nunjucks": "^3.2.2",
+    "promptly": "^3.2.0",
+    "replace-in-file": "^3.4.4"
+  }
+}

package/bin/commands/qItem/itemService.js

@@ -194,10 +194,18 @@ async function getUpdatedItem(
     const toolSchema = await schemaService.getToolSchema(
       qServer,
       existingItem.tool
-    );
-    // Removes additional properties not defined in the schema on the top level object of the item
-    toolSchema.additionalProperties = false;
-    // If options object is available additional properties not defined in the schema are removed
+      );
+      // Removes additional properties not defined in the schema on the top level object of the item
+      toolSchema.additionalProperties = false;
+
+      if(existingItem.customSchema) {
+        toolSchema.properties = {...toolSchema.properties, ...existingItem.customSchema}
+      }
+
+      if(existingItem.customSchemaDefinitions) {
+        toolSchema.definitions = {...toolSchema.definitions, ...existingItem.customSchemaDefinitions}
+      }
+      // If options object is available additional properties not defined in the schema are removed
     if (toolSchema.properties && toolSchema.properties.options) {
       toolSchema.properties.options.additionalProperties = false;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nzz/q-cli",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "Cli tool to setup new Q tools, new Q server implementations and start Q dev server to test developing Q tools",
   "main": "index.js",
   "scripts": {
@@ -40,4 +40,4 @@
     "promptly": "^3.2.0",
     "replace-in-file": "^3.4.4"
   }
-}
+}

package/skeletons/custom-code-skeleton/package.json

@@ -24,6 +24,7 @@
     "sass": "^1.43.4",
     "sirv-cli": "^1.0.12",
     "svelte": "^3.43.1",
+    "svelte-preprocess": "^4.10.7",
     "typescript": "^4.6.4"
   },
   "scripts": {
@@ -39,4 +40,4 @@
     "rollup": "rollup -c -w",
     "serve": "sirv public --dev --port 5555 --host 0.0.0.0"
   }
-}
+}

package/skeletons/custom-code-skeleton/rollup.config.js

@@ -15,6 +15,7 @@ import qConfig from "./q.config.json";
 import typescript from '@rollup/plugin-typescript';
 import image from '@rollup/plugin-image';
 import alias from '@rollup/plugin-alias';
+import sveltePreprocess from 'svelte-preprocess';
 import { createContentWidthQElement, createFullwidthQElement, getHtml, createSubtitle, createParagraph  } from '@nzz/nzz.ch-static';
 
 // Which nzz layout to use?
@@ -144,6 +145,7 @@ export default {
     json(),
     image(),
     svelte({
+      preprocess: sveltePreprocess(),
       compilerOptions: {
         // enable run-time checks when not in production
         dev: !production,