@taqueria/plugin-contract-types 0.3.0 → 0.4.0-rc2

package/src/generator/process.ts

@@ -1,66 +1,90 @@
 import * as M from '@taquito/michel-codec';
 import { GenerateApiError } from './common';
-import { parseContractStorage, parseContractParameter } from './contract-parser';
+import { parseContractParameter, parseContractStorage } from './contract-parser';
 import { SchemaOutput, toSchema } from './schema-output';
-import { TypescriptCodeOutput, toTypescriptCode, TypeAliasData, TypeUtilsData } from './typescript-output';
+import { toTypescriptCode, TypeAliasData, TypescriptCodeOutput, TypeUtilsData } from './typescript-output';
 
-const parseContractWithMinimalProtocolLevel = (contractScript: string, format: 'tz' | 'json', contractLevelIndex: number): { contract: M.MichelsonContract, protocol: { name: string, key: string } } => {
-    const contractLevels = [
-        { name: 'PsDELPH1', key: M.Protocol.PsDELPH1 },
-        { name: 'PtEdo2Zk', key: M.Protocol.PtEdo2Zk },
-        { name: 'PsFLorena', key: M.Protocol.PsFLorena },
-    ];
+const parseContractWithMinimalProtocolLevel = (
+	contractScript: string,
+	format: 'tz' | 'json',
+	contractLevelIndex: number,
+): { contract: M.MichelsonContract; protocol: { name: string; key: string } } => {
+	const contractLevels = [
+		{ name: 'PsDELPH1', key: M.Protocol.PsDELPH1 },
+		{ name: 'PtEdo2Zk', key: M.Protocol.PtEdo2Zk },
+		{ name: 'PsFLorena', key: M.Protocol.PsFLorena },
+	];
 
-    const protocol = contractLevels[contractLevelIndex];
-    if (!protocol) {
-        throw new GenerateApiError(`Could not parse contract script`, contractScript);
-    }
+	const protocol = contractLevels[contractLevelIndex];
+	if (!protocol) {
+		throw new GenerateApiError(`Could not parse contract script`, contractScript);
+	}
 
-    const p = new M.Parser({ protocol: protocol.key });
+	const p = new M.Parser({ protocol: protocol.key });
 
-    try {
-        const contract = (format === 'tz' ? p.parseScript(contractScript) : p.parseJSON(JSON.parse(contractScript))) as M.MichelsonContract;
-        if (contract) {
-            return {
-                contract,
-                protocol,
-            };
-        }
-    } catch {
-        // Ignore parse errors
-    }
+	try {
+		const contract = (format === 'tz'
+			? p.parseScript(contractScript)
+			: p.parseJSON(JSON.parse(contractScript))) as M.MichelsonContract;
+		if (contract) {
+			return {
+				contract,
+				protocol,
+			};
+		}
+	} catch {
+		// Ignore parse errors
+	}
 
-    // Try again with next level
-    return parseContractWithMinimalProtocolLevel(contractScript, format, contractLevelIndex + 1);
+	// Try again with next level
+	return parseContractWithMinimalProtocolLevel(contractScript, format, contractLevelIndex + 1);
 };
 
-export const generateContractTypesFromMichelsonCode = (contractScript: string, contractName: string, format: 'tz' | 'json', typeAliasData: TypeAliasData, typeUtilsData: TypeUtilsData): {
-    schemaOutput: SchemaOutput;
-    typescriptCodeOutput: TypescriptCodeOutput;
-    parsedContract: M.MichelsonContract;
-    minimalProtocol: string;
+export const generateContractTypesFromMichelsonCode = (
+	contractScript: string,
+	contractName: string,
+	format: 'tz' | 'json',
+	typeAliasData: TypeAliasData,
+	typeUtilsData: TypeUtilsData,
+): {
+	schemaOutput: SchemaOutput;
+	typescriptCodeOutput: TypescriptCodeOutput;
+	parsedContract: M.MichelsonContract;
+	minimalProtocol: string;
 } => {
+	const p = new M.Parser({ protocol: M.Protocol.PsFLorena });
 
-    const p = new M.Parser({ protocol: M.Protocol.PsFLorena });
+	const { contract, protocol } = parseContractWithMinimalProtocolLevel(contractScript, format, 0);
 
-    const { contract, protocol } = parseContractWithMinimalProtocolLevel(contractScript, format, 0);
+	const contractStorage = contract.find(x => x.prim === `storage`) as undefined | M.MichelsonContractStorage;
+	const contractParameter = contract.find(x => x.prim === `parameter`) as undefined | M.MichelsonContractParameter;
 
-    const contractStorage = contract.find(x => x.prim === `storage`) as undefined | M.MichelsonContractStorage;
-    const contractParameter = contract.find(x => x.prim === `parameter`) as undefined | M.MichelsonContractParameter;
+	const storageResult = contractStorage && parseContractStorage(contractStorage);
+	const storage = storageResult
+		?? { storage: { kind: `object`, raw: { prim: `never` } as M.MichelsonType, fields: [] } };
 
-    const storageResult = contractStorage && parseContractStorage(contractStorage);
-    const storage = storageResult ?? { storage: { kind: `object`, raw: { prim: `never` } as M.MichelsonType, fields: [] } };
+	const parameterResult = contractParameter && parseContractParameter(contractParameter);
+	const methods = parameterResult?.methods ?? [];
 
-    const parameterResult = contractParameter && parseContractParameter(contractParameter);
-    const methods = parameterResult?.methods ?? [];
-    const schemaOutput = toSchema(methods, storage);
+	// If there's only one entrypoint, then we call it "default"
+	if (methods.length === 1) methods[0].name = `default`;
 
-    const typescriptCode = toTypescriptCode(storage, methods, contractName, contract, protocol, typeAliasData, typeUtilsData);
+	const schemaOutput = toSchema(methods, storage);
 
-    return {
-        schemaOutput,
-        typescriptCodeOutput: typescriptCode,
-        parsedContract: contract,
-        minimalProtocol: protocol.key,
-    };
+	const typescriptCode = toTypescriptCode(
+		storage,
+		methods,
+		contractName,
+		contract,
+		protocol,
+		typeAliasData,
+		typeUtilsData,
+	);
+
+	return {
+		schemaOutput,
+		typescriptCodeOutput: typescriptCode,
+		parsedContract: contract,
+		minimalProtocol: protocol.key,
+	};
 };

package/src/generator/schema-output.ts

@@ -1,58 +1,59 @@
 import { GenerateApiError } from './common';
-import { TypedMethod, TypedVar, TypedType, TypedStorage } from './contract-parser';
+import { TypedMethod, TypedStorage, TypedType, TypedVar } from './contract-parser';
 
 type SchemaObjectType = { [name: string]: SchemaType };
 type SchemaType = string | SchemaType[] | SchemaObjectType;
 type SchemaMethods = {
-    [name: string]: {
-        params: SchemaType;
-    };
+	[name: string]: {
+		params: SchemaType;
+	};
 };
 export type SchemaOutput = {
-    methods: SchemaMethods;
-    storage: SchemaType;
+	methods: SchemaMethods;
+	storage: SchemaType;
 };
 
 export const toSchema = (methods: TypedMethod[], storage: TypedStorage): SchemaOutput => {
-
-    const getSchemaObjectType = (vars: TypedVar[]) => {
-        // console.log('getSchemaObjectType', { vars });
-
-        if (vars.some(x => !x)) {
-            throw new GenerateApiError(`getSchemaObjectType has null vars`, { vars });
-        }
-
-        return vars.reduce((out, x, i) => {
-            out[x.name ?? i] = getSchemaType(x.type);
-            return out;
-        }, {} as SchemaObjectType);
-    };
-
-    const getSchemaType = (t: TypedType): SchemaType => {
-        // console.log('getSchemaType', { t });
-
-        return (t.kind === `value` && t.value ? t.value : null)
-            ?? (t.kind === `array` && t.array ? [getSchemaType(t.array.item)] : null)
-            ?? (t.kind === `map` && t.map ? [`map`, getSchemaType(t.map.key), getSchemaType(t.map.value)] : null)
-            ?? (t.kind === `object` && t.fields ? getSchemaObjectType(t.fields) : null)
-            ?? (t.kind === `unit` ? `unit` : null)
-            ?? (t.kind === `never` ? `never` : null)
-            ?? `${t.raw as unknown as string}`;
-    };
-
-    const schemaMethods = methods.reduce((out, x) => {
-        // console.log('schemaMethods', { x });
-
-        out[x.name] = {
-            params: x.args.length === 1 && !x.args[0].name ? getSchemaType(x.args[0].type) : getSchemaObjectType(x.args ?? []),
-        };
-        return out;
-    }, {} as SchemaMethods);
-
-    const schemaStorage = getSchemaType(storage.storage);
-
-    return {
-        methods: schemaMethods,
-        storage: schemaStorage,
-    };
+	const getSchemaObjectType = (vars: TypedVar[]) => {
+		// console.log('getSchemaObjectType', { vars });
+
+		if (vars.some(x => !x)) {
+			throw new GenerateApiError(`getSchemaObjectType has null vars`, { vars });
+		}
+
+		return vars.reduce((out, x, i) => {
+			out[x.name ?? i] = getSchemaType(x.type);
+			return out;
+		}, {} as SchemaObjectType);
+	};
+
+	const getSchemaType = (t: TypedType): SchemaType => {
+		// console.log('getSchemaType', { t });
+
+		return (t.kind === `value` && t.value ? t.value : null)
+			?? (t.kind === `array` && t.array ? [getSchemaType(t.array.item)] : null)
+			?? (t.kind === `map` && t.map ? [`map`, getSchemaType(t.map.key), getSchemaType(t.map.value)] : null)
+			?? (t.kind === `object` && t.fields ? getSchemaObjectType(t.fields) : null)
+			?? (t.kind === `unit` ? `unit` : null)
+			?? (t.kind === `never` ? `never` : null)
+			?? `${t.raw as unknown as string}`;
+	};
+
+	const schemaMethods = methods.reduce((out, x) => {
+		// console.log('schemaMethods', { x });
+
+		out[x.name] = {
+			params: x.args.length === 1 && !x.args[0].name
+				? getSchemaType(x.args[0].type)
+				: getSchemaObjectType(x.args ?? []),
+		};
+		return out;
+	}, {} as SchemaMethods);
+
+	const schemaStorage = getSchemaType(storage.storage);
+
+	return {
+		methods: schemaMethods,
+		storage: schemaStorage,
+	};
 };