@citolab/tspci-qbci 2.4.2 → 2.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citolab/tspci-qbci",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "create a .ci file that can be imported into Questify",
   "author": "patrick <patrick.deklein@cito.nl>, Marcel Hoekstra <marcel.hoekstra@cito.nl>",
   "repository": "",
@@ -10,7 +10,7 @@
     "archiver": "^5.3.0"
   },
   "scripts": {},
-  "gitHead": "c8d87c1b9f0270864b9df9dc3afcf1937e6583d4",
+  "gitHead": "d68856aaf4b354c3532cc8a9a6624d6fbe89170d",
   "publishConfig": {
     "access": "public"
   }

package/readme.md

@@ -10,7 +10,7 @@ tspci --target qbci
 ## config options
 
 In the package.json of the pci:
-- typeIdentifier (required)
+- config: { tspci: { typeIdentifier: 'yourpciname' }} (required)
 - label (if empty, package name will be used)
-- width
-- height
+- config: { tspci: { width: '500' }} (optional, default: 500)
+- config: { tspci: { height: '500' }} (optional, default: 500)

package/src/createPackage.mjs

@@ -38,8 +38,11 @@ export const bundle = () => {
   const rawMetadata = fs.readFileSync(questifyMetadata);
   const questifyMetadataData = JSON.parse(rawMetadata);
 
-  const propertiesToCopy = ["width", "height"];
-
+  const propertiesToReplace = {
+    typeIdentifier: "emptytypeIdentifier",
+    width: "500",
+    height: "500",
+  };
   copyDirectoryRecursiveSync(path.join(PACKAGER_PATH, "questify-default"), outputDirectoryTemp, false);
 
   const name = packageData.label
@@ -47,18 +50,30 @@ export const bundle = () => {
     : packageData.name
     ? packageData.name.split("/")[packageData.name.split("/").length - 1]
     : "ci";
-  const typeIdentifier = packageData.typeIdentifier;
-  if (!typeIdentifier) {
-    console.error("missing type identifier in package.json");
-    process.exit();
-  }
-  questifyMetadataData.typeIdentifier = typeIdentifier;
-  questifyMetadataData.title = name;
-  for (const propertyName in propertiesToCopy) {
-    if (packageData[propertyName]) {
-      questifyMetadataData[propertyName] = packageData[propertyName];
+
+  for (const propertyName in propertiesToReplace) {
+    if (propertyName === "typeIdentifier") {
+      if (!packageData.config?.tspci[propertyName]) {
+        console.error(
+          "'typeIdentifier' should be added as an option in package.json and should match the typeIdentifier of the PCI code file."
+        );
+        return;
+      } else {
+        if (!packageData.config?.tspci[propertyName])
+          console.info(
+            `${propertyName} not specified in ${packageData.name} in package.json using { config: tspci: {${propertiesToReplace[propertyName]}}`
+          );
+      }
+    }
+    if ( packageData.config.tspci[propertyName]) {
+      propertiesToReplace[propertyName] = packageData.config.tspci[propertyName];
     }
   }
+
+  for(const propertyName in propertiesToReplace) {
+    questifyMetadataData[propertyName] = propertiesToReplace[propertyName];
+  }
+
   const metadataString = JSON.stringify(questifyMetadataData);
   fs.writeFileSync(path.join(outputDirectoryTemp, "metadata.json"), metadataString, "utf8");
 
@@ -66,10 +81,11 @@ export const bundle = () => {
   const pciFile = config.main || "/dist/index.js";
 
   // pk: add .min. to the name else QB is gonna minify it and it BREAKS
+  const scriptPath = path.join(outputDirectoryTemp, "/ref/script");
   if (!fs.existsSync(scriptPath)) {
     fs.mkdirSync(scriptPath);
   }
-  fs.copyFileSync(path.join(PACKAGE_ROOT_PATH, pciFile), path.join(outputDirectoryTemp, "/ref/script/index.min.js"));
+  fs.copyFileSync(path.join(PACKAGE_ROOT_PATH, pciFile), path.join(scriptPath, "/index.min.js"));
 
   // zip the folder
   const zipName = `questify-ci-${name}_${packageData.version}.ci`;