@clarigen/cli 3.1.0 → 3.2.0

package/dist/index.cjs

@@ -31,9 +31,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   CONFIG_FILE: () => CONFIG_FILE,
-  ClarinetConfigSchema: () => ClarinetConfigSchema,
+  ClarinetConfig: () => ClarinetConfig,
   Config: () => Config,
-  ConfigFileSchema: () => ConfigFileSchema,
+  ConfigFile: () => ConfigFile,
   DEPLOYMENT_NETWORKS: () => DEPLOYMENT_NETWORKS,
   FN_TYPES: () => FN_TYPES,
   OutputType: () => OutputType,
@@ -178,8 +178,8 @@ function clarityNameMatcher(line) {
   return /[\w|\-|\?|\!]+/.exec(line);
 }
 function findItemNameFromLine(line) {
-  const fnType = FN_TYPES.find((type) => {
-    return line.startsWith(`(define-${type}`);
+  const fnType = FN_TYPES.find((type3) => {
+    return line.startsWith(`(define-${type3}`);
   });
   if (fnType) {
     const prefix = `(define-${fnType} (`;
@@ -192,13 +192,13 @@ function findItemNameFromLine(line) {
     }
     return match[0];
   }
-  for (const type of VAR_TYPES) {
-    const prefix = `(define-${type} `;
+  for (const type3 of VAR_TYPES) {
+    const prefix = `(define-${type3} `;
     if (!line.startsWith(prefix)) continue;
     const startString = line.slice(prefix.length);
     const match = clarityNameMatcher(startString);
     if (!match) {
-      console.debug(`[claridocs]: Unable to determine ${type} name from line:
+      console.debug(`[claridocs]: Unable to determine ${type3} name from line:
   \`${line}\``);
       return;
     }
@@ -220,8 +220,8 @@ function isComment(line) {
   return line.startsWith(";;");
 }
 function getFnName(line) {
-  const fnType = FN_TYPES.find((type) => {
-    return line.startsWith(`(define-${type}`);
+  const fnType = FN_TYPES.find((type3) => {
+    return line.startsWith(`(define-${type3}`);
   });
   if (typeof fnType === "undefined") return;
   const prefix = `(define-${fnType} (`;
@@ -522,29 +522,37 @@ function generateReadme(session, excluded) {
     contractLines.push(line);
   });
   const fileContents = `# Contracts
-  
-  ${contractLines.join("\n")}
+
+${contractLines.join("\n")}
   `;
   return fileContents;
 }
 
 // src/config.ts
-var import_zod2 = require("zod");
+var import_arktype2 = require("arktype");
 
 // src/clarinet-config.ts
-var import_zod = require("zod");
+var import_arktype = require("arktype");
 var import_promises2 = require("fs/promises");
 var import_toml = require("@iarna/toml");
-var ClarinetConfigSchema = import_zod.z.object({
-  project: import_zod.z.object({
-    requirements: import_zod.z.array(import_zod.z.object({ contract_id: import_zod.z.string() })).optional(),
-    cache_location: import_zod.z.object({ path: import_zod.z.string() }).optional()
+var ClarinetConfig = (0, import_arktype.type)({
+  project: (0, import_arktype.type)({
+    requirements: (0, import_arktype.type)({
+      contract_id: (0, import_arktype.type)("string").describe("Contract ID")
+    }).array().describe("Project requirements").optional(),
+    cache_location: (0, import_arktype.type)({
+      path: (0, import_arktype.type)("string").describe("Cache location path")
+    }).optional()
   }),
-  contracts: import_zod.z.record(import_zod.z.string(), import_zod.z.object({ path: import_zod.z.string() })).optional()
+  contracts: (0, import_arktype.type)({
+    "[string]": (0, import_arktype.type)({
+      path: (0, import_arktype.type)("string").describe("Contract path")
+    })
+  }).optional()
 });
 async function getClarinetConfig(path) {
   const file = await (0, import_promises2.readFile)(path, "utf-8");
-  const config = ClarinetConfigSchema.parse((0, import_toml.parse)(file));
+  const config = ClarinetConfig.assert((0, import_toml.parse)(file));
   return config;
 }
 
@@ -559,23 +567,23 @@ var OutputType = /* @__PURE__ */ ((OutputType2) => {
   OutputType2["Docs"] = "docs";
   return OutputType2;
 })(OutputType || {});
-var typesSchema = import_zod2.z.object({
-  output: import_zod2.z.string().optional(),
-  outputs: import_zod2.z.array(import_zod2.z.string()).optional(),
-  include_accounts: import_zod2.z.boolean().optional(),
-  after: import_zod2.z.string().optional(),
-  include_boot_contracts: import_zod2.z.boolean().optional(),
-  watch_folders: import_zod2.z.array(import_zod2.z.string()).optional()
+var typesSchema = (0, import_arktype2.type)({
+  "output?": (0, import_arktype2.type)("string").describe("Path to the output file"),
+  "outputs?": (0, import_arktype2.type)("string[]").describe("Paths to the output files"),
+  "include_accounts?": (0, import_arktype2.type)("boolean").describe("Include accounts in the output"),
+  "after?": (0, import_arktype2.type)("string").describe("Script to run after the output is generated"),
+  "include_boot_contracts?": (0, import_arktype2.type)("boolean").describe("Include boot contracts in the output"),
+  "watch_folders?": (0, import_arktype2.type)("string[]").describe("Folders to watch for changes")
 }).optional();
-var ConfigFileSchema = import_zod2.z.object({
-  clarinet: import_zod2.z.string(),
+var ConfigFile = (0, import_arktype2.type)({
+  clarinet: (0, import_arktype2.type)("string").describe("Path to the Clarinet config file"),
   ["types" /* ESM */]: typesSchema,
   ["esm" /* ESM_OLD */]: typesSchema,
-  ["docs" /* Docs */]: import_zod2.z.object({
-    output: import_zod2.z.string().optional(),
-    outputs: import_zod2.z.array(import_zod2.z.string()).optional(),
-    exclude: import_zod2.z.array(import_zod2.z.string()).optional(),
-    after: import_zod2.z.string().optional()
+  ["docs" /* Docs */]: (0, import_arktype2.type)({
+    "output?": (0, import_arktype2.type)("string").describe("Path to docs output folder. Defaults to ./docs"),
+    "outputs?": (0, import_arktype2.type)("string[]").describe("Paths to docs output folders"),
+    "exclude?": (0, import_arktype2.type)("string[]").describe("Contracts to exclude from docs generation"),
+    "after?": (0, import_arktype2.type)("string").describe("Script to run after docs are generated")
   }).optional()
 });
 var defaultConfigFile = {
@@ -599,36 +607,36 @@ var Config = class {
     const clarinet = await getClarinetConfig((0, import_path3.resolve)(cwd ?? "", config.clarinet));
     return new this(config, clarinet, cwd);
   }
-  getOutputs(type) {
+  getOutputs(type3) {
     var _a, _b;
-    const singlePath = (_a = this.configFile[type]) == null ? void 0 : _a.output;
-    const multiPath = ((_b = this.configFile[type]) == null ? void 0 : _b.outputs) || [];
+    const singlePath = (_a = this.configFile[type3]) == null ? void 0 : _a.output;
+    const multiPath = ((_b = this.configFile[type3]) == null ? void 0 : _b.outputs) || [];
     if (singlePath !== void 0) return [singlePath];
     return multiPath;
   }
-  outputResolve(type, filePath) {
-    const outputs = this.getOutputs(type);
-    if (!this.supports(type)) return null;
+  outputResolve(type3, filePath) {
+    const outputs = this.getOutputs(type3);
+    if (!this.supports(type3)) return null;
     return outputs.map((path) => {
       return (0, import_path3.resolve)(this.cwd, path, filePath || "");
     });
   }
-  async writeOutput(type, contents, filePath) {
-    const paths = this.outputResolve(type, filePath);
+  async writeOutput(type3, contents, filePath) {
+    const paths = this.outputResolve(type3, filePath);
     if (paths === null) return null;
     await Promise.all(
       paths.map(async (path) => {
         await writeFile(path, contents);
-        log.debug(`Generated ${type} file at ${(0, import_path3.relative)(this.cwd, path)}`);
+        log.debug(`Generated ${type3} file at ${(0, import_path3.relative)(this.cwd, path)}`);
       })
     );
     return paths;
   }
-  supports(type) {
-    return this.getOutputs(type).length > 0;
+  supports(type3) {
+    return this.getOutputs(type3).length > 0;
   }
-  type(type) {
-    return this.configFile[type];
+  type(type3) {
+    return this.configFile[type3];
   }
   get esm() {
     return this.configFile["types" /* ESM */];
@@ -658,16 +666,12 @@ async function getConfig(cwd) {
   if (await fileExists(path)) {
     const toml = await (0, import_promises3.readFile)(path, "utf-8");
     const parsedToml = (0, import_toml2.parse)(toml);
-    const parseResult = ConfigFileSchema.safeParse(parsedToml);
-    if (parseResult.success) {
-      sessionConfig = parseResult.data;
-    } else {
-      logger.error("Error parsing Clarigen.toml:");
-      parseResult.error.errors.forEach((e) => {
-        logger.error(`${e.path.join(".")}: ${e.message}`);
-      });
-      throw new Error("Error parsing Clarigen.toml");
+    const parsed = ConfigFile(parsedToml);
+    if (parsed instanceof import_arktype2.type.errors) {
+      logger.error(`Error parsing Clarigen config: ${parsed.summary}`);
+      throw new Error(`Error parsing Clarigen config: ${parsed.summary}`);
     }
+    sessionConfig = parsed;
   } else {
     sessionConfig = defaultConfigFile;
   }
@@ -770,9 +774,9 @@ var jsTypeFromAbiType = (val, isArgument = false) => {
     return `${innerType} | null`;
   } else if ((0, import_core4.isClarityAbiTuple)(val)) {
     const tupleDefs = [];
-    val.tuple.forEach(({ name, type }) => {
+    val.tuple.forEach(({ name, type: type3 }) => {
       const camelName = (0, import_core5.toCamelCase)(name);
-      const innerType = jsTypeFromAbiType(type, isArgument);
+      const innerType = jsTypeFromAbiType(type3, isArgument);
       tupleDefs.push(`"${camelName}": ${innerType};`);
     });
     return `{
@@ -972,9 +976,9 @@ export const simnet = {
 function encodeVariables(variables) {
   return variables.map((v) => {
     let varLine = `${encodeVariableName(v.name)}: `;
-    const type = jsTypeFromAbiType(v.type);
+    const type3 = jsTypeFromAbiType(v.type);
     const varJSON = serialize(v);
-    varLine += `${varJSON} as TypedAbiVariable<${type}>`;
+    varLine += `${varJSON} as TypedAbiVariable<${type3}>`;
     return varLine;
   });
 }
@@ -1011,6 +1015,20 @@ function serializeArray(key, lines) {
 }
 
 // src/files/variables.ts
+function clarityVersionForContract(contract) {
+  switch (contract.contract_interface.clarity_version) {
+    case "Clarity1":
+      return 1;
+    case "Clarity2":
+      return 2;
+    case "Clarity3":
+      return 3;
+    case "Clarity4":
+      return 4;
+    default:
+      return 3;
+  }
+}
 function getVariablesV2(contract, simnet, verbose) {
   const [deployer] = contract.contract_id.split(".");
   const fakeId = `${(0, import_core8.getContractName)(contract.contract_id)}-vars`;
@@ -1046,7 +1064,7 @@ ${varFn}`;
       fakeId,
       fullSrc,
       {
-        clarityVersion: 3
+        clarityVersion: clarityVersionForContract(contract)
       },
       deployer
     );
@@ -1293,9 +1311,9 @@ async function afterESM(config) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CONFIG_FILE,
-  ClarinetConfigSchema,
+  ClarinetConfig,
   Config,
-  ConfigFileSchema,
+  ConfigFile,
   DEPLOYMENT_NETWORKS,
   FN_TYPES,
   OutputType,