@prismatic-io/spectral 10.18.7-preview.1 → 10.18.7-preview.3

package/dist/generators/componentManifest/cli.js

@@ -117,17 +117,13 @@ const runMain = (process) => __awaiter(void 0, void 0, void 0, function* () {
         console.error("Component is invalid.");
         process.exit(1);
     }
-    const packageJson = (0, fs_extra_1.readJsonSync)(path_1.default.join(__dirname, "../../../package.json"));
+    const { version: spectralVersion } = require("../../../package.json");
     yield (0, index_1.createComponentManifest)({
         component,
         dryRun: flags.dry_run.value,
         skipSignatureVerify: flags.skip_signature_verify.value,
         packageName: (_a = flags.name.value) !== null && _a !== void 0 ? _a : `@component-manifests/${component.key}`,
-        dependencies: {
-            spectral: packageJson.version,
-            dependencies: packageJson.dependencies,
-            devDependencies: packageJson.devDependencies,
-        },
+        spectralVersion,
         verbose: flags.verbose.value,
         sourceDir: path_1.default.join(__dirname, "templates"),
         destinationDir: flags.output_dir.value

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

@@ -1,22 +1,17 @@
 import type { Component } from "../../serverTypes";
 import type { ConfigVarResultCollection, Inputs, TriggerPayload, TriggerResult } from "../../types";
-export interface PackageDependencies {
-    spectral: string;
-    dependencies: Record<string, string>;
-    devDependencies: Record<string, string>;
-}
 interface CreateStaticFilesProps<TInputs extends Inputs, TActionInputs extends Inputs, TConfigVars extends ConfigVarResultCollection = ConfigVarResultCollection, TPayload extends TriggerPayload = TriggerPayload, TAllowsBranching extends boolean = boolean, TResult extends TriggerResult<TAllowsBranching, TPayload> = TriggerResult<TAllowsBranching, TPayload>> {
     component: Component<TInputs, TActionInputs, TConfigVars, TPayload, TAllowsBranching, TResult>;
     dryRun: boolean;
     signature: string | null;
     packageName: string;
-    dependencies: PackageDependencies;
+    spectralVersion: string;
     verbose: boolean;
     sourceDir: string;
     destinationDir: string;
     registry: string | null;
 }
-export declare const createStaticFiles: <TInputs extends Inputs, TActionInputs extends Inputs, TConfigVars extends ConfigVarResultCollection = ConfigVarResultCollection, TPayload extends TriggerPayload = TriggerPayload, TAllowsBranching extends boolean = boolean, TResult extends TriggerResult<TAllowsBranching, TPayload> = TriggerResult<TAllowsBranching, TPayload>>({ component, dryRun, signature, packageName, dependencies, verbose, sourceDir, destinationDir, registry, }: CreateStaticFilesProps<TInputs, TActionInputs, TConfigVars, TPayload, TAllowsBranching, TResult>) => Promise<{
+export declare const createStaticFiles: <TInputs extends Inputs, TActionInputs extends Inputs, TConfigVars extends ConfigVarResultCollection = ConfigVarResultCollection, TPayload extends TriggerPayload = TriggerPayload, TAllowsBranching extends boolean = boolean, TResult extends TriggerResult<TAllowsBranching, TPayload> = TriggerResult<TAllowsBranching, TPayload>>({ component, dryRun, signature, packageName, spectralVersion, verbose, sourceDir, destinationDir, registry, }: CreateStaticFilesProps<TInputs, TActionInputs, TConfigVars, TPayload, TAllowsBranching, TResult>) => Promise<{
     index: string | void;
     packageJson: string | void;
     tsConfig: string | void;
@@ -37,13 +32,13 @@ export declare const renderIndex: ({ component, dryRun, verbose, sourceDir, dest
 interface RenderPackageJsonProps {
     dryRun: boolean;
     packageName: string;
-    dependencies: PackageDependencies;
+    spectralVersion: string;
     verbose: boolean;
     sourceDir: string;
     destinationDir: string;
     registry: string | null;
 }
-export declare const renderPackageJson: ({ dryRun, packageName, dependencies, verbose, sourceDir, destinationDir, registry, }: RenderPackageJsonProps) => Promise<string | void>;
+export declare const renderPackageJson: ({ dryRun, packageName, spectralVersion, verbose, sourceDir, destinationDir, registry, }: RenderPackageJsonProps) => Promise<string | void>;
 interface RenderTsConfigProps {
     dryRun: boolean;
     verbose: boolean;

package/dist/generators/componentManifest/createStaticFiles.js

@@ -16,7 +16,7 @@ exports.renderReadme = exports.renderTsConfig = exports.renderPackageJson = expo
 const path_1 = __importDefault(require("path"));
 const createTemplate_1 = require("../utils/createTemplate");
 const helpers_1 = require("./helpers");
-const createStaticFiles = (_a) => __awaiter(void 0, [_a], void 0, function* ({ component, dryRun, signature, packageName, dependencies, verbose, sourceDir, destinationDir, registry, }) {
+const createStaticFiles = (_a) => __awaiter(void 0, [_a], void 0, function* ({ component, dryRun, signature, packageName, spectralVersion, verbose, sourceDir, destinationDir, registry, }) {
     var _b, _c, _d, _e;
     if (verbose) {
         console.info("Creating static files...");
@@ -34,7 +34,7 @@ const createStaticFiles = (_a) => __awaiter(void 0, [_a], void 0, function* ({ c
     });
     const packageJson = yield (0, exports.renderPackageJson)({
         dryRun,
-        dependencies,
+        spectralVersion,
         packageName,
         verbose,
         sourceDir,
@@ -104,14 +104,13 @@ const renderIndex = (_a) => __awaiter(void 0, [_a], void 0, function* ({ compone
     });
 });
 exports.renderIndex = renderIndex;
-const renderPackageJson = (_a) => __awaiter(void 0, [_a], void 0, function* ({ dryRun, packageName, dependencies, verbose, sourceDir, destinationDir, registry, }) {
+const renderPackageJson = (_a) => __awaiter(void 0, [_a], void 0, function* ({ dryRun, packageName, spectralVersion, verbose, sourceDir, destinationDir, registry, }) {
     return yield (0, createTemplate_1.createTemplate)({
         source: path_1.default.join(sourceDir, "package.json.ejs"),
         destination: path_1.default.join(destinationDir, "package.json"),
         data: {
             packageName,
-            spectralVersion: dependencies.spectral,
-            typescriptVersion: dependencies.devDependencies.typescript,
+            spectralVersion,
             helpers: helpers_1.helpers,
             registry,
         },

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

@@ -1,16 +1,15 @@
 import type { Component } from "../../serverTypes";
 import type { ConfigVarResultCollection, Inputs, TriggerPayload, TriggerResult } from "../../types";
-import { type PackageDependencies } from "./createStaticFiles";
 interface CreateComponentManifestProps<TInputs extends Inputs, TActionInputs extends Inputs, TConfigVars extends ConfigVarResultCollection = ConfigVarResultCollection, TPayload extends TriggerPayload = TriggerPayload, TAllowsBranching extends boolean = boolean, TResult extends TriggerResult<TAllowsBranching, TPayload> = TriggerResult<TAllowsBranching, TPayload>> {
     component: Component<TInputs, TActionInputs, TConfigVars, TPayload, TAllowsBranching, TResult>;
     dryRun: boolean;
     skipSignatureVerify: boolean;
     packageName: string;
-    dependencies: PackageDependencies;
+    spectralVersion: string;
     verbose: boolean;
     sourceDir: string;
     destinationDir: string;
     registry: string | null;
 }
-export declare const createComponentManifest: <TInputs extends Inputs, TActionInputs extends Inputs, TConfigVars extends ConfigVarResultCollection = ConfigVarResultCollection, TPayload extends TriggerPayload = TriggerPayload, TAllowsBranching extends boolean = boolean, TResult extends TriggerResult<TAllowsBranching, TPayload> = TriggerResult<TAllowsBranching, TPayload>>({ component, dryRun, skipSignatureVerify, packageName, dependencies, verbose, sourceDir, destinationDir, registry, }: CreateComponentManifestProps<TInputs, TActionInputs, TConfigVars, TPayload, TAllowsBranching, TResult>) => Promise<void>;
+export declare const createComponentManifest: <TInputs extends Inputs, TActionInputs extends Inputs, TConfigVars extends ConfigVarResultCollection = ConfigVarResultCollection, TPayload extends TriggerPayload = TriggerPayload, TAllowsBranching extends boolean = boolean, TResult extends TriggerResult<TAllowsBranching, TPayload> = TriggerResult<TAllowsBranching, TPayload>>({ component, dryRun, skipSignatureVerify, packageName, spectralVersion, verbose, sourceDir, destinationDir, registry, }: CreateComponentManifestProps<TInputs, TActionInputs, TConfigVars, TPayload, TAllowsBranching, TResult>) => Promise<void>;
 export {};

package/dist/generators/componentManifest/index.js

@@ -21,7 +21,7 @@ const createDataSources_1 = require("./createDataSources");
 const createStaticFiles_1 = require("./createStaticFiles");
 const createTriggers_1 = require("./createTriggers");
 const removeComponentManifest_1 = require("./removeComponentManifest");
-const createComponentManifest = (_a) => __awaiter(void 0, [_a], void 0, function* ({ component, dryRun, skipSignatureVerify, packageName, dependencies, verbose, sourceDir, destinationDir, registry, }) {
+const createComponentManifest = (_a) => __awaiter(void 0, [_a], void 0, function* ({ component, dryRun, skipSignatureVerify, packageName, spectralVersion, verbose, sourceDir, destinationDir, registry, }) {
     const signature = yield (0, prism_1.getComponentSignatureWithPrism)({
         skipSignatureVerify,
     });
@@ -38,7 +38,7 @@ const createComponentManifest = (_a) => __awaiter(void 0, [_a], void 0, function
         dryRun,
         packageName,
         signature,
-        dependencies,
+        spectralVersion,
         verbose,
         sourceDir,
         destinationDir,

package/dist/generators/componentManifest/templates/package.json.ejs

@@ -13,7 +13,7 @@
   "devDependencies": {
     "@prismatic-io/spectral": "<%= spectralVersion %>",
     "rimraf": "5.0.7",
-    "typescript": "<%= typescriptVersion %>"
+    "typescript": "5.5.3"
   },
   "peerDependencies": {
     "@prismatic-io/spectral": ">= <%= spectralVersion %>"

package/dist/serverTypes/convertComponent.d.ts

@@ -1,6 +1,12 @@
 import { type ComponentDefinition, type ComponentHooks, type ConfigVarResultCollection, type ConnectionDefinition, type ConnectionInput, type ConnectionTemplateInputField, type InputFieldDefinition, type Inputs, type OnPremConnectionInput, type TriggerDefinition, type TriggerPayload, type TriggerResult } from "../types";
 import { type PollingTriggerDefinition } from "../types/PollingTriggerDefinition";
 import type { Component as ServerComponent, Connection as ServerConnection, Input as ServerInput, Trigger as ServerTrigger } from ".";
+import { type CleanFn } from "./perform";
+/** Auto-generated cleaner for structuredObject/dynamicObject containers.
+ * Recursively delegates to each child's clean function. Developers do not
+ * declare a top-level clean on these containers — the conversion always
+ * supplies one so nested clean functions are applied at runtime. */
+export declare const cleanerFor: (input: InputFieldDefinition) => CleanFn | undefined;
 export declare const convertInput: (key: string, definition: InputFieldDefinition | OnPremConnectionInput | ConnectionInput) => ServerInput;
 export declare const _isValidTemplateValue: (template: string, inputs: {
     [key: string]: ConnectionInput | ConnectionTemplateInputField;

package/dist/serverTypes/convertComponent.js

@@ -14,12 +14,52 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertComponent = exports.convertConnection = exports.convertTrigger = exports.convertTemplateInput = exports._isValidTemplateValue = exports.convertInput = void 0;
+exports.convertComponent = exports.convertConnection = exports.convertTrigger = exports.convertTemplateInput = exports._isValidTemplateValue = exports.convertInput = exports.cleanerFor = void 0;
 const omit_1 = __importDefault(require("lodash/omit"));
 const types_1 = require("../types");
 const PollingTriggerDefinition_1 = require("../types/PollingTriggerDefinition");
 const perform_1 = require("./perform");
-const cleanerFor = (input) => "clean" in input ? input.clean : undefined;
+const isPlainObject = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+/** Auto-generated cleaner for structuredObject/dynamicObject containers.
+ * Recursively delegates to each child's clean function. Developers do not
+ * declare a top-level clean on these containers — the conversion always
+ * supplies one so nested clean functions are applied at runtime. */
+const cleanerFor = (input) => {
+    if (input.type === "structuredObject") {
+        const childCleaners = Object.entries(input.inputs).reduce((acc, [childKey, childDef]) => (Object.assign(Object.assign({}, acc), { [childKey]: (0, exports.cleanerFor)(childDef) })), {});
+        return (value) => {
+            if (!isPlainObject(value)) {
+                return value;
+            }
+            return (0, perform_1.cleanParams)(value, childCleaners);
+        };
+    }
+    if (input.type === "dynamicObject") {
+        const configCleaners = {};
+        for (const [configKey, configDef] of Object.entries(input.configurations)) {
+            configCleaners[configKey] = Object.entries(configDef.inputs).reduce((acc, [childKey, childDef]) => (Object.assign(Object.assign({}, acc), { [childKey]: (0, exports.cleanerFor)(childDef) })), {});
+        }
+        return (value) => {
+            if (!isPlainObject(value)) {
+                return value;
+            }
+            const { configuration, values } = value;
+            if (typeof configuration !== "string") {
+                return value;
+            }
+            const cleaners = configCleaners[configuration];
+            if (!cleaners) {
+                return { configuration, values };
+            }
+            return {
+                configuration,
+                values: isPlainObject(values) ? (0, perform_1.cleanParams)(values, cleaners) : values,
+            };
+        };
+    }
+    return "clean" in input ? input.clean : undefined;
+};
+exports.cleanerFor = cleanerFor;
 const convertInput = (key, definition) => {
     // Cast: the field union is wider than any single member; runtime guards below handle it.
     const _a = definition, { default: defaultValue, type, label, collection, inputs: childInputs, configurations } = _a, rest = __rest(_a, ["default", "type", "label", "collection", "inputs", "configurations"]);
@@ -86,7 +126,7 @@ exports.convertTemplateInput = convertTemplateInput;
 const convertAction = (actionKey, _a, hooks) => {
     var { inputs = {}, perform } = _a, action = __rest(_a, ["inputs", "perform"]);
     const convertedInputs = Object.entries(inputs).map(([key, value]) => (0, exports.convertInput)(key, value));
-    const inputCleaners = Object.entries(inputs).reduce((result, [key, value]) => (Object.assign(Object.assign({}, result), { [key]: cleanerFor(value) })), {});
+    const inputCleaners = Object.entries(inputs).reduce((result, [key, value]) => (Object.assign(Object.assign({}, result), { [key]: (0, exports.cleanerFor)(value) })), {});
     return Object.assign(Object.assign({}, action), { key: actionKey, inputs: convertedInputs, perform: (0, perform_1.createPerform)(perform, {
             inputCleaners,
             errorHandler: hooks === null || hooks === void 0 ? void 0 : hooks.error,
@@ -101,7 +141,7 @@ const convertTrigger = (triggerKey, trigger, hooks) => {
     const convertedTriggerInputs = Object.entries(inputs).map(([key, value]) => {
         return (0, exports.convertInput)(key, value);
     });
-    const triggerInputCleaners = Object.entries(inputs).reduce((result, [key, value]) => (Object.assign(Object.assign({}, result), { [key]: cleanerFor(value) })), {});
+    const triggerInputCleaners = Object.entries(inputs).reduce((result, [key, value]) => (Object.assign(Object.assign({}, result), { [key]: (0, exports.cleanerFor)(value) })), {});
     let scheduleSupport = "scheduleSupport" in trigger ? trigger.scheduleSupport : "invalid";
     let convertedActionInputs = [];
     let performToUse;
@@ -117,7 +157,7 @@ const convertTrigger = (triggerKey, trigger, hooks) => {
                 accum.push((0, exports.convertInput)(key, value));
                 return accum;
             }, []);
-            actionInputCleaners = Object.entries(action.inputs).reduce((result, [key, value]) => (Object.assign(Object.assign({}, result), { [key]: cleanerFor(value) })), {});
+            actionInputCleaners = Object.entries(action.inputs).reduce((result, [key, value]) => (Object.assign(Object.assign({}, result), { [key]: (0, exports.cleanerFor)(value) })), {});
         }
         const combinedCleaners = Object.assign({}, actionInputCleaners, triggerInputCleaners);
         performToUse = (0, perform_1.createPollingPerform)(trigger, {
@@ -169,7 +209,7 @@ exports.convertTrigger = convertTrigger;
 const convertDataSource = (dataSourceKey, _a, hooks) => {
     var { inputs = {}, perform } = _a, dataSource = __rest(_a, ["inputs", "perform"]);
     const convertedInputs = Object.entries(inputs).map(([key, value]) => (0, exports.convertInput)(key, value));
-    const inputCleaners = Object.entries(inputs).reduce((result, [key, value]) => (Object.assign(Object.assign({}, result), { [key]: cleanerFor(value) })), {});
+    const inputCleaners = Object.entries(inputs).reduce((result, [key, value]) => (Object.assign(Object.assign({}, result), { [key]: (0, exports.cleanerFor)(value) })), {});
     return Object.assign(Object.assign({}, dataSource), { key: dataSourceKey, inputs: convertedInputs, perform: (0, perform_1.createPerform)(perform, {
             inputCleaners,
             errorHandler: hooks === null || hooks === void 0 ? void 0 : hooks.error,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prismatic-io/spectral",
-  "version": "10.18.7-preview.1",
+  "version": "10.18.7-preview.3",
   "description": "Utility library for building Prismatic connectors and code-native integrations",
   "keywords": [
     "prismatic"