@prismatic-io/spectral 9.1.0 → 9.1.2

package/dist/generators/componentManifest/getImports.js

@@ -7,10 +7,10 @@ const getImports = ({ inputs }) => {
             return acc;
         }
         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].includes(input.valueType.import)
+                    ? [...acc[input.valueType.module], input.valueType.import]
                     : acc[input.valueType.module]
-                : [input.valueType.type] });
+                : [input.valueType.import] });
     }, {});
 };
 exports.getImports = getImports;

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

@@ -4,6 +4,11 @@ export type ServerTypeInput = InputBase & {
     onPremControlled?: boolean;
     shown?: boolean;
 };
+type ValueType = string | {
+    type: string;
+    import: string;
+    module: string;
+};
 export interface Input {
     key: string;
     label: string;
@@ -13,20 +18,14 @@ export interface Input {
     required: boolean | undefined;
     default: ServerTypeInput["default"];
 }
-export type ValueType = string | {
-    type: string;
-    module: string;
-};
-export type DocBlock = {
-    inputKey?: string;
-    propertyKey: keyof ServerTypeInput;
-    propertyValue?: unknown;
-    output?: string;
-}[];
 interface GetInputsProps {
     inputs: ServerTypeInput[];
     docBlock?: (input: ServerTypeInput) => string;
 }
 export declare const getInputs: ({ inputs, docBlock }: GetInputsProps) => Input[];
-export declare const INPUT_TYPE_MAP: Record<InputFieldDefinition["type"], ValueType>;
+type InputType = string | {
+    type: string;
+    module: string;
+};
+export declare const INPUT_TYPE_MAP: Record<InputFieldDefinition["type"], InputType>;
 export {};

package/dist/generators/componentManifest/getInputs.js

@@ -3,10 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.INPUT_TYPE_MAP = exports.getInputs = void 0;
 const docBlock_1 = require("./docBlock");
 const getDefaultValue = (value) => {
-    if (value === undefined || value === "") {
-        return value;
-    }
-    if (typeof value === "string") {
+    if (value === undefined || value === "" || typeof value === "string") {
         return value;
     }
     return JSON.stringify(value);
@@ -43,41 +40,50 @@ exports.INPUT_TYPE_MAP = {
     boolean: "boolean",
     code: "string",
     conditional: {
-        type: "ConditionalExpression",
         module: "@prismatic-io/spectral",
+        type: "ConditionalExpression",
     },
     connection: {
-        type: "Connection",
         module: "@prismatic-io/spectral",
+        type: "Connection",
     },
     objectSelection: {
-        type: "ObjectSelection",
         module: "@prismatic-io/spectral",
+        type: "ObjectSelection",
     },
     objectFieldMap: {
-        type: "ObjectFieldMap",
         module: "@prismatic-io/spectral",
+        type: "ObjectFieldMap",
     },
     jsonForm: {
-        type: "JSONForm",
         module: "@prismatic-io/spectral",
+        type: "JSONForm",
     },
     dynamicObjectSelection: "string",
     dynamicFieldSelection: "string",
 };
 const getInputValueType = (input) => {
+    const inputType = exports.INPUT_TYPE_MAP[input.type];
     const valueType = input.model
         ? input.model
             .map((choice) => {
             return `\`${choice.value.replaceAll("\r", "\\r").replaceAll("\n", "\\n")}\``;
         })
             .join(" | ")
-        : exports.INPUT_TYPE_MAP[input.type] || "never";
+        : inputType
+            ? typeof inputType === "string"
+                ? inputType
+                : Object.assign(Object.assign({}, inputType), { import: inputType.type })
+            : "never";
     if (input.collection === "keyvaluelist") {
-        return `Record<string, ${valueType}> | Array<{key: string, value: ${valueType}}>`;
+        return typeof valueType === "string"
+            ? `Record<string, ${valueType}> | Array<{key: string, value: ${valueType}}>`
+            : Object.assign(Object.assign({}, valueType), { type: `Record<string, ${valueType.type}> | Array<{key: string, value: ${valueType.type}}>` });
     }
     if (input.collection === "valuelist") {
-        return `${valueType}[]`;
+        return typeof valueType === "string"
+            ? `${valueType}[]`
+            : Object.assign(Object.assign({}, valueType), { type: `${valueType.type}[]` });
     }
     return valueType;
 };

package/dist/serverTypes/convertIntegration.js

@@ -310,6 +310,7 @@ const convertInputValue = (value, collectionType) => {
 };
 /** Converts a Config Var into the structure necessary for YAML generation. */
 const convertConfigVar = (key, configVar, referenceKey, componentRegistry) => {
+    var _a;
     const { orgOnly, meta } = convertConfigVarPermissionAndVisibility((0, lodash_1.pick)(configVar, ["permissionAndVisibilityType", "visibleToOrgDeployer"]));
     if ((0, types_1.isConnectionDefinitionConfigVar)(configVar)) {
         const { stableKey, description } = (0, lodash_1.pick)(configVar, ["stableKey", "description"]);
@@ -373,6 +374,9 @@ const convertConfigVar = (key, configVar, referenceKey, componentRegistry) => {
     if ((0, types_1.isScheduleConfigVar)(configVar)) {
         result.scheduleType = "custom";
     }
+    if ((0, types_1.isJsonFormConfigVar)(configVar) || (0, types_1.isJsonFormDataSourceConfigVar)(configVar)) {
+        result.meta = Object.assign(Object.assign({}, result.meta), { validationMode: (_a = configVar === null || configVar === void 0 ? void 0 : configVar.validationMode) !== null && _a !== void 0 ? _a : "ValidateAndShow" });
+    }
     if ((0, types_1.isDataSourceDefinitionConfigVar)(configVar)) {
         result.dataType = configVar.dataSourceType;
         result.dataSource = {
@@ -385,6 +389,9 @@ const convertConfigVar = (key, configVar, referenceKey, componentRegistry) => {
         result.dataType = componentRegistry[ref.component.key].dataSources[ref.key].dataSourceType;
         result.dataSource = ref;
         result.inputs = inputs;
+        if (configVar.validationMode) {
+            result.meta = Object.assign(Object.assign({}, result.meta), { validationMode: configVar.validationMode });
+        }
     }
     return result;
 };
@@ -410,7 +417,7 @@ const convertOnExecution = (onExecution, componentRegistry) => (context, params)
     // Construct the component methods from the component registry
     const componentMethods = Object.entries(componentRegistry).reduce((accumulator, [registryComponentKey, { key: componentKey, actions, public: isPublic, signature }]) => {
         const componentActions = Object.entries(actions).reduce((actionsAccumulator, [registryActionKey, action]) => {
-            const manifestActions = componentRegistry[componentKey].actions[registryActionKey];
+            const manifestActions = componentRegistry[registryComponentKey].actions[registryActionKey];
             // Define the method to be called for the action
             const invokeAction = (values) => __awaiter(void 0, void 0, void 0, function* () {
                 var _a;

package/dist/types/ConfigVars.d.ts

@@ -1,3 +1,4 @@
+import { ValidationMode } from "@jsonforms/core";
 import { type DataSourceDefinition, type ConnectionDefinition, type Inputs, type DataSourceType, type Connection, type JSONForm, type ObjectFieldMap, type ObjectSelection, type ConfigVarResultCollection, type Schedule, type CollectionDataSourceType, type DataSourceReference, type ConfigPage, type ConfigPages, type ConfigPageElement, type ComponentRegistryDataSource, type ComponentRegistryConnection, type UserLevelConfigPages } from ".";
 import type { Prettify, UnionToIntersection } from "./utils";
 /** Supported data types for Config Vars. */
@@ -105,12 +106,22 @@ type ScheduleConfigVar = CreateStandardConfigVar<"schedule"> & {
 };
 type ObjectSelectionConfigVar = CreateStandardConfigVar<"objectSelection">;
 type ObjectFieldMapConfigVar = CreateStandardConfigVar<"objectFieldMap">;
-type JsonFormConfigVar = CreateStandardConfigVar<"jsonForm">;
+type JsonFormConfigVar = CreateStandardConfigVar<"jsonForm"> & {
+    validationMode?: ValidationMode;
+};
+type JsonFormDataSourceDefinitionConfigVar = DataSourceDefinitionConfigVar & {
+    validationMode?: ValidationMode;
+};
 export type StandardConfigVar = StringConfigVar | DateConfigVar | TimestampConfigVar | PicklistConfigVar | CodeConfigVar | BooleanConfigVar | NumberConfigVar | ScheduleConfigVar | ObjectSelectionConfigVar | ObjectFieldMapConfigVar | JsonFormConfigVar;
 type BaseDataSourceConfigVar<TDataSourceType extends DataSourceType = DataSourceType> = TDataSourceType extends CollectionDataSourceType ? {
     dataSourceType: TDataSourceType;
     collectionType?: CollectionType | undefined;
-} & BaseConfigVar : TDataSourceType extends Exclude<DataSourceType, CollectionDataSourceType> ? BaseConfigVar & {
+} & BaseConfigVar : TDataSourceType extends Exclude<DataSourceType, CollectionDataSourceType> ? TDataSourceType extends Extract<DataSourceType, "jsonForm"> ? BaseConfigVar & {
+    dataSourceType: Extract<DataSourceType, "jsonForm">;
+    dataSource?: never;
+    collectionType?: undefined;
+    validationMode?: ValidationMode;
+} : BaseConfigVar & {
     dataSourceType: TDataSourceType;
     collectionType?: undefined;
 } : ({
@@ -123,6 +134,7 @@ type BaseDataSourceConfigVar<TDataSourceType extends DataSourceType = DataSource
 type DataSourceDefinitionConfigVar = DataSourceType extends infer TDataSourceType ? TDataSourceType extends DataSourceType ? BaseDataSourceConfigVar<TDataSourceType> & Omit<DataSourceDefinition<Inputs, ConfigVarResultCollection, TDataSourceType>, "display" | "inputs" | "examplePayload" | "detailDataSource"> : never : never;
 type DataSourceReferenceConfigVar = ComponentRegistryDataSource extends infer TDataSourceReference extends ComponentRegistryDataSource ? Omit<BaseDataSourceConfigVar<TDataSourceReference["dataSourceType"]>, "dataSourceType"> & {
     dataSource: TDataSourceReference["reference"];
+    validationMode?: ValidationMode;
 } : never;
 /** Defines attributes of a data source Config Var. */
 export type DataSourceConfigVar = DataSourceDefinitionConfigVar | DataSourceReferenceConfigVar;
@@ -165,6 +177,8 @@ type ExtractConfigVars<TConfigPages extends {
 export type ConfigVars = Prettify<UnionToIntersection<ExtractConfigVars<ConfigPages>>> & Prettify<UnionToIntersection<ExtractConfigVars<UserLevelConfigPages>>>;
 export declare const isCodeConfigVar: (cv: ConfigVar) => cv is CodeConfigVar;
 export declare const isScheduleConfigVar: (cv: ConfigVar) => cv is ScheduleConfigVar;
+export declare const isJsonFormConfigVar: (cv: ConfigVar) => cv is JsonFormConfigVar;
+export declare const isJsonFormDataSourceConfigVar: (cv: ConfigVar) => cv is JsonFormDataSourceDefinitionConfigVar;
 export declare const isDataSourceDefinitionConfigVar: (cv: ConfigVar) => cv is DataSourceDefinitionConfigVar;
 export declare const isDataSourceReferenceConfigVar: (cv: unknown) => cv is DataSourceReferenceConfigVar;
 export declare const isConnectionDefinitionConfigVar: (cv: ConfigVar) => cv is ConnectionDefinitionConfigVar;

package/dist/types/ConfigVars.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isConnectionReferenceConfigVar = exports.isConnectionDefinitionConfigVar = exports.isDataSourceReferenceConfigVar = exports.isDataSourceDefinitionConfigVar = exports.isScheduleConfigVar = exports.isCodeConfigVar = void 0;
+exports.isConnectionReferenceConfigVar = exports.isConnectionDefinitionConfigVar = exports.isDataSourceReferenceConfigVar = exports.isDataSourceDefinitionConfigVar = exports.isJsonFormDataSourceConfigVar = exports.isJsonFormConfigVar = exports.isScheduleConfigVar = exports.isCodeConfigVar = void 0;
 const _1 = require(".");
 const isCodeConfigVar = (cv) => "dataType" in cv && cv.dataType === "code";
 exports.isCodeConfigVar = isCodeConfigVar;
 const isScheduleConfigVar = (cv) => "dataType" in cv && cv.dataType === "schedule";
 exports.isScheduleConfigVar = isScheduleConfigVar;
+const isJsonFormConfigVar = (cv) => "dataType" in cv && cv.dataType === "jsonForm";
+exports.isJsonFormConfigVar = isJsonFormConfigVar;
+const isJsonFormDataSourceConfigVar = (cv) => "dataSourceType" in cv && cv.dataSourceType === "jsonForm";
+exports.isJsonFormDataSourceConfigVar = isJsonFormDataSourceConfigVar;
 const isDataSourceDefinitionConfigVar = (cv) => "dataSourceType" in cv && "perform" in cv && typeof cv.perform === "function";
 exports.isDataSourceDefinitionConfigVar = isDataSourceDefinitionConfigVar;
 const isDataSourceReferenceConfigVar = (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prismatic-io/spectral",
-  "version": "9.1.0",
+  "version": "9.1.2",
   "description": "Utility library for building Prismatic components",
   "keywords": ["prismatic"],
   "main": "dist/index.js",
@@ -39,7 +39,7 @@
   "files": ["dist/"],
   "dependencies": {
     "@jsonforms/core": "3.0.0",
-    "axios": "1.6.2",
+    "axios": "1.7.4",
     "axios-retry": "3.9.1",
     "date-fns": "2.30.0",
     "ejs": "^3.1.10",