@taqueria/protocol 0.0.0-pr-899-aeb9c96e → 0.0.0-pr-902-0bc36f81

package/EphemeralState.ts

@@ -4,7 +4,6 @@ import * as Config from '@taqueria/protocol/Config';
 import type { i18n } from '@taqueria/protocol/i18n';
 import * as InstalledPlugin from '@taqueria/protocol/InstalledPlugin';
 import * as Option from '@taqueria/protocol/Option';
-import * as ParsedOperation from '@taqueria/protocol/ParsedOperation';
 import * as ParsedPluginInfo from '@taqueria/protocol/ParsedPluginInfo';
 import { E_TaqError, TaqError } from '@taqueria/protocol/TaqError';
 import * as Task from '@taqueria/protocol/Task';
@@ -23,18 +22,11 @@ const taskToPluginMap = z.record(
 		Task.schemas.schema,
 	], { description: 'Task/Plugin Mapping' }),
 );
-const operationToPluginMap = z.record(
-	z.union([
-		InstalledPlugin.schemas.schema,
-		ParsedOperation.schemas.schema,
-	], { description: 'Operation/Plugin Mapping' }),
-);
 
 const rawSchema = z.object({
 	build: z.string({ description: 'cache.build' }),
 	configHash: z.string({ description: 'cache.configHash' }),
 	tasks: taskToPluginMap,
-	operations: operationToPluginMap,
 	plugins: z.array(ParsedPluginInfo.schemas.schema, { description: 'cache.plugins' }),
 }).describe('Ephemeral State');
 
@@ -49,7 +41,6 @@ export const { schemas: generatedSchemas, factory } = createType<RawInput, RawIn
 export type EphemeralState = z.infer<typeof generatedSchemas.schema>;
 export type t = EphemeralState;
 export type TaskToPluginMap = z.infer<typeof taskToPluginMap>;
-export type OpToPluginMap = z.infer<typeof operationToPluginMap>;
 
 export const { create, of, make } = factory;
 
@@ -83,27 +74,6 @@ const getTaskCounts = (pluginInfo: ParsedPluginInfo.t[]): Counts => {
 	);
 };
 
-const getOperationCounts = (pluginInfo: ParsedPluginInfo.t[]): Counts => {
-	return pluginInfo.reduce(
-		(retval, pluginInfo) =>
-			pluginInfo.operations === undefined
-				? retval
-				: pluginInfo.operations.reduce(
-					(retval: Counts, operation: ParsedOperation.t) => {
-						const operationName = operation.operation;
-						const providers = retval[operationName]
-							? [...retval[operationName], pluginInfo]
-							: [pluginInfo];
-						const mapping: Counts = {};
-						mapping[operationName] = providers.filter(provider => provider !== undefined);
-						return { ...retval, ...mapping };
-					},
-					retval,
-				),
-		{} as Counts,
-	);
-};
-
 const toChoices = (plugins: ParsedPluginInfo.t[]) =>
 	plugins.reduce(
 		(retval, pluginInfo) => {
@@ -141,6 +111,7 @@ export const mapTasksToPlugins = (config: Config.t, pluginInfo: ParsedPluginInfo
 											description: 'Specify which plugin should be used to execute this task',
 											choices: toChoices(taskCounts[task]),
 											required: true,
+											type: 'string',
 										})),
 									],
 									handler: 'proxy',
@@ -161,46 +132,6 @@ export const mapTasksToPlugins = (config: Config.t, pluginInfo: ParsedPluginInfo
 	).pipe(mapRej(rej => rej as TaqError));
 };
 
-export const mapOperationsToPlugins = (config: Config.t, pluginInfo: ParsedPluginInfo.t[], i18n: i18n) => {
-	const opCounts = getOperationCounts(pluginInfo);
-	return attemptP(async () =>
-		await pluginInfo.reduce(
-			async (retval, pluginInfo) =>
-				!pluginInfo.operations
-					? Promise.resolve({} as OpToPluginMap)
-					: await pluginInfo.operations.reduce(
-						async (retval, { operation }) => {
-							if (isComposite(operation, opCounts)) {
-								const command = await eager(Command.make(operation));
-								const compositeOp = await eager(ParsedOperation.make({
-									operation,
-									command,
-									description: i18n.__('providedByMany'),
-									options: [
-										await eager(Option.make({
-											flag: await eager(Verb.make('plugin')),
-											description: 'Specify which plugin should be used to execute this operation',
-											choices: toChoices(opCounts[operation]),
-											required: true,
-										})),
-									],
-								}));
-								return { ...await retval, [operation]: compositeOp };
-							}
-
-							// Operation is provided by just a single plugin
-							const installedPlugin = getInstalledPlugin(config, pluginInfo.name);
-							return installedPlugin
-								? { ...await retval, [operation]: installedPlugin }
-								: retval;
-						},
-						retval,
-					),
-			Promise.resolve({} as OpToPluginMap),
-		)
-	).pipe(mapRej(rej => rej as TaqError));
-};
-
 export const getTasks = (pluginInfo: ParsedPluginInfo.t[]) =>
 	pluginInfo.reduce(
 		(retval: Task.t[], pluginInfo) => [...retval, ...(pluginInfo.tasks ?? [])],

package/Option.ts

@@ -16,7 +16,10 @@ export const internalSchema = z.object({
 		{ description: 'Option Choices' },
 	).optional(),
 	required: z.boolean({ description: 'Option Is Required' }).default(false).optional(),
-	boolean: z.boolean({ description: 'Option Is Boolean' }).default(false).optional(),
+	type: z.union(
+		[z.literal('string'), z.literal('number'), z.literal('boolean')],
+		{ description: 'Positional Arg Datatype' },
+	),
 }).describe('Option');
 
 export const rawSchema = z.object({
@@ -32,7 +35,10 @@ export const rawSchema = z.object({
 		{ description: 'Option Choices' },
 	).optional(),
 	required: z.boolean({ description: 'Option Is Required' }).default(false).optional(),
-	boolean: z.boolean({ description: 'Option Is Boolean' }).default(false).optional(),
+	type: z.union(
+		[z.literal('string'), z.literal('number'), z.literal('boolean')],
+		{ description: 'Positional Arg Datatype' },
+	),
 }).describe('Option');
 
 type RawInput = z.infer<typeof rawSchema>;

package/PositionalArg.ts

@@ -12,7 +12,8 @@ export const rawSchema = z.object({
 	type: z.union(
 		[z.literal('string'), z.literal('number'), z.literal('boolean')],
 		{ description: 'Positional Arg Datatype' },
-	).optional(),
+	),
+	required: z.boolean().optional(),
 }).describe('Positional Arg');
 
 const internalSchema = z.object({
@@ -25,7 +26,8 @@ const internalSchema = z.object({
 	type: z.union(
 		[z.literal('string'), z.literal('number'), z.literal('boolean')],
 		{ description: 'Positional Arg Datatype' },
-	).optional(),
+	),
+	required: z.boolean().optional(),
 }).describe('Positional Arg');
 
 type RawInput = z.infer<typeof rawSchema>;

package/SanitizedArgs.ts

@@ -62,10 +62,10 @@ export const scaffoldRawSchema = rawSchema.extend({
 
 export const provisionRawSchema = rawSchema
 	.extend({
-		operation: z
+		task: z
 			.string()
 			.min(1)
-			.describe('Operation name'),
+			.describe('Task name'),
 		name: z
 			.string()
 			.min(1)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/protocol",
-	"version": "0.0.0-pr-899-aeb9c96e",
+	"version": "0.0.0-pr-902-0bc36f81",
 	"description": "A TypeScript package which contains types that are to be shared between @taqueria/node-sdk and @taqueria/taqueria.",
 	"main": "index.js",
 	"scripts": {

package/Provisioner.ts

@@ -1,61 +0,0 @@
-import createType from '@taqueria/protocol/Base';
-import * as ProvisionerID from '@taqueria/protocol/ProvisionerID';
-import { z } from 'zod';
-
-export const rawSchema = z.object(
-	{
-		id: ProvisionerID.rawSchema,
-		plugin: z
-			.string()
-			.min(1)
-			.describe('Provisioner Plugin')
-			.optional(),
-		operation: z
-			.union([
-				z.string().min(1),
-				z.literal('custom'),
-			])
-			.describe('Provisioner Operation'),
-		command: z
-			.string()
-			.describe('Provisioner Custom Command')
-			.optional(),
-		label: z
-			.string()
-			.describe('Provisioner Label')
-			.optional(),
-		depends_on: z
-			.array(
-				ProvisionerID.rawSchema,
-			)
-			.optional(),
-	},
-	{
-		description: 'Provisioner',
-	},
-)
-	.passthrough();
-
-export const internalSchema = rawSchema.extend({
-	id: ProvisionerID.schemas.schema,
-	depends_on: z.array(ProvisionerID.schemas.schema).optional(),
-});
-
-type RawInput = z.infer<typeof rawSchema>;
-type Input = z.infer<typeof internalSchema>;
-
-export const { schemas: generatedSchemas, factory } = createType<RawInput, Input>({
-	rawSchema,
-	internalSchema,
-	parseErrMsg: 'There was a problem trying to parse the provisioner',
-	unknownErrMsg: 'Something went wrong trying to parse the provisioner',
-});
-
-export type Provisioner = z.infer<typeof generatedSchemas.schema>;
-export type t = Provisioner;
-export const { create, of, make } = factory;
-
-export const schemas = {
-	...generatedSchemas,
-	schema: generatedSchemas.schema.transform(val => val as unknown as Provisioner),
-};

package/ProvisionerID.ts

@@ -1,25 +0,0 @@
-import createType from '@taqueria/protocol/Base';
-import { z } from 'zod';
-
-export const rawSchema = z
-	.string()
-	.min(1)
-	.regex(/^[A-Za-z0-9]+[A-Za-z0-9-_]+\.[A-Za-z0-9]+[A-Za-z0-9-_]+\.[A-Za-z0-9]+[A-Za-z0-9-_]+$/)
-	.describe('Provisioner ID');
-
-type RawInput = z.infer<typeof rawSchema>;
-
-export const { schemas: generatedSchemas, factory } = createType<RawInput, RawInput>({
-	rawSchema,
-	parseErrMsg: (value: unknown) => `${value} is not a valid provisioner ID`,
-	unknownErrMsg: 'Something went wrong trying to parse the provision ID',
-});
-
-export type ProvisionerID = z.infer<typeof generatedSchemas.schema>;
-export type t = ProvisionerID;
-export const { create, of, make } = factory;
-
-export const schemas = {
-	...generatedSchemas,
-	schema: generatedSchemas.schema.transform(val => val as ProvisionerID),
-};

package/Provisions.ts

@@ -1,70 +0,0 @@
-import createType, { Flatten } from '@taqueria/protocol/Base';
-import * as Provisioner from '@taqueria/protocol/Provisioner';
-import * as ProvisionerID from '@taqueria/protocol/ProvisionerID';
-import { memoizy } from 'memoizy';
-import { partitionArray, uniq } from 'rambda';
-import { z } from 'zod';
-
-const getInvalidIds = memoizy((provisions: Provisioner.t[]) => {
-	const ids = provisions.map(p => p.id);
-	return provisions.reduce(
-		(retval, provision) => {
-			const depends_on = provision.depends_on ?? [];
-			const invalid = partitionArray(
-				(id: ProvisionerID.t) => ids.includes(id),
-				depends_on,
-			).pop() as ProvisionerID.t[];
-
-			return uniq([...retval, ...invalid]);
-		},
-		[] as ProvisionerID.t[],
-	);
-});
-
-const rawSchema = z
-	.array(
-		Provisioner.rawSchema,
-	)
-	.refine(
-		provisions => getInvalidIds(provisions).length === 0,
-		provisions => ({
-			message:
-				`One or more of your provisioners depends on an invalid provisioner. The following provisioner ids were referenced that do not exist: ${
-					getInvalidIds(provisions).join(', ')
-				}`,
-		}),
-	)
-	.describe('Provisions');
-
-type RawInput = z.infer<typeof rawSchema>;
-
-const internalSchema = z
-	.array(Provisioner.schemas.schema)
-	.refine(
-		provisions => getInvalidIds(provisions).length === 0,
-		provisions => ({
-			message:
-				`One or more of your provisioners depends on an invalid provisioner. The following provisioner ids were referenced that do not exist: ${
-					getInvalidIds(provisions).join(', ')
-				}`,
-		}),
-	)
-	.describe('Provisions');
-
-type Input = z.infer<typeof internalSchema>;
-
-export const { schemas: generatedSchemas, factory } = createType<RawInput, Input>({
-	rawSchema,
-	internalSchema,
-	parseErrMsg: (value: unknown) => `The following provision is invalid: ${value}`,
-	unknownErrMsg: 'Something went wrong parsing the list of provisioners',
-});
-
-export type Provisions = Flatten<z.infer<typeof generatedSchemas.schema>>;
-export type t = Provisions;
-export const { create, of, make } = factory;
-
-export const schemas = {
-	...generatedSchemas,
-	schema: generatedSchemas.schema.transform(val => val as Provisions),
-};