@prismatic-io/spectral 9.0.0-rc.8 → 9.0.0-rc.9

package/dist/generators/componentManifest/getImports.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getImports = void 0;
 const getImports = ({ inputs }) => {
     return inputs.reduce((acc, input) => {
-        if (typeof input.type === "string") {
+        if (typeof input.valueType === "string") {
             return acc;
         }
-        return Object.assign(Object.assign({}, acc), { [input.type.module]: acc[input.type.module]
-                ? !acc[input.type.module].includes(input.type.type)
-                    ? [...acc[input.type.module], input.type.type]
-                    : acc[input.type.module]
-                : [input.type.type] });
+        return Object.assign(Object.assign({}, acc), { [input.valueType.module]: acc[input.valueType.module]
+                ? !acc[input.valueType.module].includes(input.valueType.type)
+                    ? [...acc[input.valueType.module], input.valueType.type]
+                    : acc[input.valueType.module]
+                : [input.valueType.type] });
     }, {});
 };
 exports.getImports = getImports;

package/dist/generators/componentManifest/getInputs.d.ts

@@ -6,14 +6,15 @@ declare type ServerTypeInput = InputBase & {
 export interface Input {
     key: string;
     label: string;
-    type: InputType;
+    inputType: string;
+    valueType: ValueType;
     required: boolean | undefined;
     properties: {
         key: keyof ServerTypeInput;
         value: string;
     }[];
 }
-export declare type InputType = string | {
+export declare type ValueType = string | {
     type: string;
     module: string;
 };
@@ -28,5 +29,5 @@ interface GetInputsProps {
     docBlock: DocBlock;
 }
 export declare const getInputs: ({ inputs, docBlock }: GetInputsProps) => Input[];
-export declare const INPUT_TYPE_MAP: Record<InputFieldDefinition["type"], InputType>;
+export declare const INPUT_TYPE_MAP: Record<InputFieldDefinition["type"], ValueType>;
 export {};

package/dist/generators/componentManifest/getInputs.js

@@ -6,11 +6,11 @@ const getInputs = ({ inputs, docBlock }) => {
         return {
             key: input.key,
             label: input.label,
-            type: getInputType(input),
+            inputType: input.type,
+            valueType: getInputValueType(input),
             required: input.required,
             collection: input.collection,
-            inputType: input.type,
-            onPremiseControlled: input.onPremiseControlled || input.onPremControlled,
+            onPremControlled: input.onPremiseControlled || input.onPremControlled,
             properties: docBlock.reduce((acc, { propertyKey, inputKey, propertyValue, output }) => {
                 if (inputKey && inputKey !== input.key) {
                     return acc;
@@ -77,12 +77,12 @@ exports.INPUT_TYPE_MAP = {
     dynamicObjectSelection: "string",
     dynamicFieldSelection: "string",
 };
-const getInputType = (input) => {
+const getInputValueType = (input) => {
     const valueType = input.model
         ? input.model.map((choice) => `"${choice.value}"`).join(" | ")
         : exports.INPUT_TYPE_MAP[input.type] || "never";
     if (input.collection === "keyvaluelist") {
-        return `Record<string, ${valueType}>`;
+        return `Record<string, ${valueType}> | Array<{key: string, value: ${valueType}}>`;
     }
     if (input.collection === "valuelist") {
         return `${valueType}[]`;

package/dist/generators/componentManifest/removeComponentManifest.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeComponentManifest = void 0;
-const fs_extra_1 = require("fs-extra");
+const fs_1 = require("fs");
 const removeComponentManifest = ({ destinationDir, verbose, }) => {
     if (verbose) {
         console.info("Removing existing component manifest files...");
     }
     try {
-        (0, fs_extra_1.removeSync)(destinationDir);
+        if ((0, fs_1.existsSync)(destinationDir)) {
+            (0, fs_1.rmSync)(destinationDir, { recursive: true, force: true });
+        }
     }
     catch (err) {
         console.error(err);

package/dist/generators/componentManifest/templates/partials/inputs.ejs

@@ -1,6 +1,7 @@
 <% inputs.forEach((input) => { -%>
   <%= input.key %>: {
-    inputType: "<%= input.defaultType %>",
+    valueType: "<%- input.valueType.type ? input.valueType.type : input.valueType %>",
+    inputType: "<%= input.inputType %>",
     <%_ if (input.collection) { -%>
     collection: "<%= input.collection %>" as const,
     <%_ } else { -%>

package/dist/generators/componentManifest/templates/partials/performArgs.ejs

@@ -6,5 +6,5 @@
    * @<%= property.key %> <%- property.value %>
    <%_ }); -%>
    */
-  <%= input.key %><%= input.required ? "" : "?" %>: <%- input.type.type ? input.type.type : input.type %>;
+  <%= input.key %><%= input.required ? "" : "?" %>: <%- input.valueType.type ? input.valueType.type : input.valueType %>;
 <% }); -%>

package/dist/serverTypes/convertIntegration.js

@@ -388,6 +388,13 @@ const convertOnExecution = (onExecution, componentRegistry) => (context, params)
                 // Transform the input values based on the action's inputs
                 const transformedValues = Object.entries(values).reduce((transformedAccumulator, [inputKey, inputValue]) => {
                     const { collection } = action.inputs[inputKey];
+                    if (collection === "keyvaluelist" &&
+                        Array.isArray(inputValue)) {
+                        transformedAccumulator[inputKey] = inputValue.reduce((acc, { key, value }) => {
+                            return [...acc, { key, value }];
+                        }, []);
+                        return transformedAccumulator;
+                    }
                     // Transform key-value list inputs
                     if (collection === "keyvaluelist" &&
                         Object.keys(inputValue).length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prismatic-io/spectral",
-  "version": "9.0.0-rc.8",
+  "version": "9.0.0-rc.9",
   "description": "Utility library for building Prismatic components",
   "keywords": [
     "prismatic"