@taqueria/plugin-ligo 0.37.21 → 0.37.34

package/index.js

@@ -28,109 +28,33 @@ var import_promises = require("fs/promises");
 // ligo_templates.ts
 var mligo_template = `
 type storage = int
-
-type parameter =
-  Increment of int
-| Decrement of int
-| Reset
-
 type return = operation list * storage
 
-// Two entrypoints
-
-let add (store, delta : storage * int) : storage = store + delta
-let sub (store, delta : storage * int) : storage = store - delta
-
-(* Main access point that dispatches to the entrypoints according to
-   the smart contract parameter. *)
-   
-let main (action, store : parameter * storage) : return =
- ([] : operation list),    // No operations
- (match action with
-   Increment (n) -> add (store, n)
- | Decrement (n) -> sub (store, n)
- | Reset         -> 0)
-`;
-var pascaligo_template = `
-type storage is int
-
-type parameter is
-  Increment of int
-| Decrement of int
-| Reset
-
-type return is list (operation) * storage
-
-// Two entrypoints
-
-function add (const store : storage; const delta : int) : storage is 
-  store + delta
-
-function sub (const store : storage; const delta : int) : storage is 
-  store - delta
-
-(* Main access point that dispatches to the entrypoints according to
-   the smart contract parameter. *)
-   
-function main (const action : parameter; const store : storage) : return is
- ((nil : list (operation)),    // No operations
-  case action of [
-    Increment (n) -> add (store, n)
-  | Decrement (n) -> sub (store, n)
-  | Reset         -> 0
-  ])
-`;
-var religo_template = `
-type storage = int;
-
-type parameter =
-  Increment (int)
-| Decrement (int)
-| Reset;
-
-type return = (list (operation), storage);
-
-// Two entrypoints
-
-let add = ((store, delta) : (storage, int)) : storage => store + delta;
-let sub = ((store, delta) : (storage, int)) : storage => store - delta;
-
-/* Main access point that dispatches to the entrypoints according to
-   the smart contract parameter. */
-   
-let main = ((action, store) : (parameter, storage)) : return => {
- (([] : list (operation)),    // No operations
- (switch (action) {
-  | Increment (n) => add ((store, n))
-  | Decrement (n) => sub ((store, n))
-  | Reset         => 0}))
-};
+(* Three entrypoints *)
+[@entry] let increment (delta : int) (store : storage) : return =
+  [], store + delta
+[@entry] let decrement (delta : int) (store : storage) : return =
+  [], store - delta
+[@entry] let reset (() : unit) (_ : storage) : return =
+  [], 0
 `;
 var jsligo_template = `
 type storage = int;
-
-type parameter =
-  ["Increment", int]
-| ["Decrement", int]
-| ["Reset"];
-
 type ret = [list<operation>, storage];
 
-// Two entrypoints
+// Three entrypoints
 
-const add = ([store, delta] : [storage, int]) : storage => store + delta;
-const sub = ([store, delta] : [storage, int]) : storage => store - delta;
+// @entry
+const increment = (delta : int, store : storage) : ret =>
+  [list([]), store + delta];
 
-/* Main access point that dispatches to the entrypoints according to
-   the smart contract parameter. */
+// @entry
+const decrement = (delta : int, store : storage) : ret =>
+  [list([]), store - delta];
 
-const main = ([action, store] : [parameter, storage]) : ret => {
- return [list([]) as list<operation>,    // No operations
- match (action, {
-  Increment:(n: int) => add ([store, n]),
-  Decrement:(n: int) => sub ([store, n]),
-  Reset    :()  => 0})]
-};
+// @entry
+const reset = (_ : unit, _ : storage) : ret =>
+  [list([]), 0];
 `;
 
 // createContract.ts
@@ -139,19 +63,11 @@ var getLigoTemplate = async (contractName, syntax) => {
   const ext = matchResult ? matchResult[0].substring(1) : null;
   if (syntax === "mligo")
     return mligo_template;
-  if (syntax === "ligo")
-    return pascaligo_template;
-  if (syntax === "religo")
-    return religo_template;
   if (syntax === "jsligo")
     return jsligo_template;
   if (syntax === void 0) {
     if (ext === "mligo")
       return mligo_template;
-    if (ext === "ligo")
-      return pascaligo_template;
-    if (ext === "religo")
-      return religo_template;
     if (ext === "jsligo")
       return jsligo_template;
     return (0, import_node_sdk.sendAsyncErr)(
@@ -176,7 +92,7 @@ var import_node_sdk8 = require("@taqueria/node-sdk");
 // common.ts
 var import_node_sdk2 = require("@taqueria/node-sdk");
 var import_path = require("path");
-var LIGO_DEFAULT_IMAGE = "ligolang/ligo:0.69.0";
+var LIGO_DEFAULT_IMAGE = "ligolang/ligo:0.71.0";
 var LIGO_IMAGE_ENV_VAR = "TAQ_LIGO_IMAGE";
 var getLigoDockerImage = () => (0, import_node_sdk2.getDockerImage)(LIGO_DEFAULT_IMAGE, LIGO_IMAGE_ENV_VAR);
 var getInputFilenameAbsPath = (parsedArgs, sourceFile) => (0, import_path.join)(parsedArgs.config.projectDir, parsedArgs.config.contractsDir ?? "contracts", sourceFile);
@@ -195,17 +111,63 @@ var import_promises2 = require("fs/promises");
 var import_path2 = require("path");
 var COMPILE_ERR_MSG = "Not compiled";
 var isStorageKind = (exprKind) => exprKind === "storage" || exprKind === "default_storage";
-var isLIGOFile = (sourceFile) => /.+\.(ligo|religo|mligo|jsligo)$/.test(sourceFile);
+var isSupportedLigoSyntax = (sourceFile) => /\.(mligo|jsligo)$/.test(sourceFile);
+var isUnsupportedLigoSyntax = (sourceFile) => /\.(ligo|religo)$/.test(sourceFile);
+var isLIGOFile = (sourceFile) => isSupportedLigoSyntax(sourceFile) || isUnsupportedLigoSyntax(sourceFile);
 var isStorageListFile = (sourceFile) => /.+\.(storageList|storages)\.(ligo|religo|mligo|jsligo)$/.test(sourceFile);
 var isParameterListFile = (sourceFile) => /.+\.(parameterList|parameters)\.(ligo|religo|mligo|jsligo)$/.test(sourceFile);
-var isContractFile = (sourceFile) => isLIGOFile(sourceFile) && !isStorageListFile(sourceFile) && !isParameterListFile(sourceFile);
-var getModuleName = async (parsedArgs, sourceFile) => {
-  const fileContent = await (0, import_promises2.readFile)(getInputFilenameAbsPath(parsedArgs, sourceFile), "utf8");
-  if (fileContent.includes("@entry") && fileContent.includes("module")) {
-    const match = fileContent.match(/module ([^\s]+)/);
-    return match ? match[1] : void 0;
+var listContractModules = async (parsedArgs, sourceFile) => {
+  try {
+    await (0, import_node_sdk3.getArch)();
+    const cmd = await getListDeclarationsCmd(parsedArgs, sourceFile);
+    const { stderr, stdout } = await (0, import_node_sdk3.execCmd)(cmd);
+    if (stderr.length > 0)
+      return Promise.reject(stderr);
+    return JSON.parse(stdout).declarations.reduce(
+      (acc, decl) => {
+        const srcFile = removeExt((0, import_path2.basename)(sourceFile));
+        const syntax = extractExt(sourceFile).replace(".", "");
+        if (decl === "main") {
+          return [...acc, { moduleName: srcFile, sourceName: sourceFile, sourceFile, type: "file-main", syntax }];
+        } else if (decl === "$main") {
+          return [...acc, { moduleName: srcFile, sourceName: sourceFile, sourceFile, type: "file-entry", syntax }];
+        } else if (decl.endsWith(".main")) {
+          const moduleName = decl.replace(/\.main$/, "");
+          return [...acc, {
+            moduleName,
+            sourceName: `${sourceFile}/${moduleName}`,
+            sourceFile,
+            type: "module-main",
+            syntax
+          }];
+        } else if (decl.endsWith(".$main")) {
+          const moduleName = decl.replace(/\.\$main$/, "");
+          return [...acc, {
+            moduleName,
+            sourceName: `${sourceFile}/${moduleName}`,
+            sourceFile,
+            type: "module-entry",
+            syntax
+          }];
+        }
+        return acc;
+      },
+      []
+    );
+  } catch (err) {
+    emitExternalError(err, sourceFile);
+    return [];
   }
-  return void 0;
+};
+var getListDeclarationsCmd = async (parsedArgs, sourceFile) => {
+  const projectDir = process.env.PROJECT_DIR ?? parsedArgs.projectDir;
+  if (!projectDir)
+    throw new Error(`No project directory provided`);
+  const baseCmd = `DOCKER_DEFAULT_PLATFORM=linux/amd64 docker run --rm -v "${projectDir}":/project -w /project -u $(id -u):$(id -g) ${getLigoDockerImage()} info list-declarations`;
+  const inputFile = getInputFilenameRelPath(parsedArgs, sourceFile);
+  const flags = "--display-format json";
+  const cmd = `${baseCmd} ${inputFile} ${flags}`;
+  return cmd;
 };
 var extractExt = (path) => {
   const matchResult = path.match(/\.(ligo|religo|mligo|jsligo)$/);
@@ -216,291 +178,396 @@ var removeExt = (path) => {
   return path.replace(extRegex, "");
 };
 var isOutputFormatJSON = (parsedArgs) => parsedArgs.json;
-var getOutputContractFilename = (parsedArgs, sourceFile) => {
-  const outputFile = (0, import_path2.basename)(sourceFile, (0, import_path2.extname)(sourceFile));
+var getOutputContractFilename = (parsedArgs, module2) => {
   const ext = isOutputFormatJSON(parsedArgs) ? ".json" : ".tz";
-  return (0, import_path2.join)((0, import_node_sdk3.getArtifactsDir)(parsedArgs), `${outputFile}${ext}`);
+  return (0, import_path2.join)((0, import_node_sdk3.getArtifactsDir)(parsedArgs), `${module2.moduleName}${ext}`);
 };
-var getContractNameForExpr = (sourceFile, exprKind) => {
-  try {
-    return isStorageKind(exprKind) ? sourceFile.match(/.+(?=\.(?:storageList|storages)\.(ligo|religo|mligo|jsligo))/).join(".") : sourceFile.match(/.+(?=\.(?:parameterList|parameters)\.(ligo|religo|mligo|jsligo))/).join(".");
-  } catch (err) {
-    throw new Error(`Something went wrong internally when dealing with filename format: ${err}`);
-  }
-};
-var getOutputExprFilename = (parsedArgs, sourceFile, exprKind, exprName) => {
-  const contractName = (0, import_path2.basename)(getContractNameForExpr(sourceFile, exprKind), (0, import_path2.extname)(sourceFile));
+var getOutputExprFilename = (parsedArgs, module2, exprKind, exprName) => {
+  const contractName = module2.moduleName;
   const ext = isOutputFormatJSON(parsedArgs) ? ".json" : ".tz";
   const outputFile = exprKind === "default_storage" ? `${contractName}.default_storage${ext}` : `${contractName}.${exprKind}.${exprName}${ext}`;
   return (0, import_path2.join)((0, import_node_sdk3.getArtifactsDir)(parsedArgs), `${outputFile}`);
 };
-var getCompileContractCmd = async (parsedArgs, sourceFile) => {
+var getCompileContractCmd = async (parsedArgs, sourceFile, module2) => {
   const projectDir = process.env.PROJECT_DIR ?? parsedArgs.projectDir;
   if (!projectDir)
-    throw `No project directory provided`;
+    throw new Error(`No project directory provided`);
   const baseCmd = `DOCKER_DEFAULT_PLATFORM=linux/amd64 docker run --rm -v "${projectDir}":/project -w /project -u $(id -u):$(id -g) ${getLigoDockerImage()} compile contract`;
   const inputFile = getInputFilenameRelPath(parsedArgs, sourceFile);
-  const outputFile = `-o ${getOutputContractFilename(parsedArgs, sourceFile)}`;
+  const outputFile = `-o ${getOutputContractFilename(parsedArgs, module2)}`;
   const flags = isOutputFormatJSON(parsedArgs) ? " --michelson-format json " : "";
-  const moduleName = await getModuleName(parsedArgs, sourceFile);
-  const entryFlag = moduleName ? `-m ${moduleName}` : "";
-  const cmd = `${baseCmd} ${inputFile} ${outputFile} ${flags}${entryFlag}`;
+  const moduleFlag = module2.type.startsWith("file-") ? "" : `-m ${module2.moduleName}`;
+  const cmd = `${baseCmd} ${inputFile} ${outputFile} ${flags}${moduleFlag}`;
   return cmd;
 };
-var getCompileExprCmd = (parsedArgs, sourceFile, exprKind, exprName) => {
+var getCompileExprCmd = (parsedArgs, sourceFile, module2, exprKind, exprName) => {
   const projectDir = process.env.PROJECT_DIR ?? parsedArgs.projectDir;
   if (!projectDir)
-    throw `No project directory provided`;
+    throw new Error(`No project directory provided`);
   const compilerType = isStorageKind(exprKind) ? "storage" : "parameter";
   const baseCmd = `DOCKER_DEFAULT_PLATFORM=linux/amd64 docker run --rm -v "${projectDir}":/project -w /project -u $(id -u):$(id -g) ${getLigoDockerImage()} compile ${compilerType}`;
   const inputFile = getInputFilenameRelPath(parsedArgs, sourceFile);
-  const outputFile = `-o ${getOutputExprFilename(parsedArgs, sourceFile, exprKind, exprName)}`;
+  const outputFile = `-o ${getOutputExprFilename(parsedArgs, module2, exprKind, exprName)}`;
   const flags = isOutputFormatJSON(parsedArgs) ? " --michelson-format json " : "";
-  const cmd = `${baseCmd} ${inputFile} ${exprName} ${outputFile} ${flags}`;
+  const moduleFlag = (() => {
+    switch (module2.type) {
+      case "file-main":
+      case "file-entry":
+        return "-m Contract";
+      default:
+        return `-m Contract.${module2.moduleName}`;
+    }
+  })();
+  const cmd = `${baseCmd} ${inputFile} ${exprName} ${outputFile} ${flags} ${moduleFlag}`;
   return cmd;
 };
-var compileContract = async (parsedArgs, sourceFile) => {
+var compileContract = async (parsedArgs, sourceFile, module2) => {
   try {
     await (0, import_node_sdk3.getArch)();
-    const cmd = await getCompileContractCmd(parsedArgs, sourceFile);
+    const cmd = await getCompileContractCmd(parsedArgs, sourceFile, module2);
     const { stderr } = await (0, import_node_sdk3.execCmd)(cmd);
     if (stderr.length > 0)
       (0, import_node_sdk3.sendWarn)(stderr);
     return {
-      contract: sourceFile,
-      artifact: getOutputContractFilename(parsedArgs, sourceFile)
+      source: module2.sourceName,
+      artifact: getOutputContractFilename(parsedArgs, module2)
     };
   } catch (err) {
     emitExternalError(err, sourceFile);
     return {
-      contract: sourceFile,
+      source: module2.sourceName,
       artifact: COMPILE_ERR_MSG
     };
   }
 };
-var compileExpr = (parsedArgs, sourceFile, exprKind) => (exprName) => (0, import_node_sdk3.getArch)().then(() => getCompileExprCmd(parsedArgs, sourceFile, exprKind, exprName)).then(import_node_sdk3.execCmd).then(({ stderr }) => {
-  if (stderr.length > 0)
-    (0, import_node_sdk3.sendWarn)(stderr);
-  const artifactName = getOutputExprFilename(parsedArgs, sourceFile, exprKind, exprName);
-  return {
-    contract: sourceFile,
-    artifact: artifactName
-  };
-}).catch((err) => {
-  emitExternalError(err, sourceFile);
-  return {
-    contract: sourceFile,
-    artifact: COMPILE_ERR_MSG
-  };
-});
+var compileExpr = (parsedArgs, sourceFile, module2, exprKind) => (exprName) => {
+  return (0, import_node_sdk3.getArch)().then(() => getCompileExprCmd(parsedArgs, sourceFile, module2, exprKind, exprName)).then(import_node_sdk3.execCmd).then(({ stderr }) => {
+    if (stderr.length > 0)
+      (0, import_node_sdk3.sendWarn)(stderr);
+    const artifactName = getOutputExprFilename(parsedArgs, module2, exprKind, exprName);
+    return {
+      source: module2.sourceName,
+      artifact: artifactName
+    };
+  }).catch((err) => {
+    emitExternalError(err, sourceFile);
+    return {
+      source: module2.sourceName,
+      artifact: `${sourceFile} not compiled`
+    };
+  });
+};
 var getExprNames = (parsedArgs, sourceFile) => (0, import_promises2.readFile)(getInputFilenameAbsPath(parsedArgs, sourceFile), "utf8").then((data) => data.match(/(?<=\n\s*(let|const)\s+)[a-zA-Z0-9_]+/g) ?? []);
-var compileExprs = (parsedArgs, sourceFile, exprKind) => getExprNames(parsedArgs, sourceFile).then((exprNames) => {
+var compileExprs = (parsedArgs, sourceFile, module2, exprKind) => getExprNames(parsedArgs, sourceFile).then((exprNames) => {
   if (exprNames.length === 0)
     return [];
   const firstExprName = exprNames.slice(0, 1)[0];
   const restExprNames = exprNames.slice(1, exprNames.length);
   const firstExprKind = isStorageKind(exprKind) ? "default_storage" : "parameter";
   const restExprKind = isStorageKind(exprKind) ? "storage" : "parameter";
-  const firstExprResult = compileExpr(parsedArgs, sourceFile, firstExprKind)(firstExprName);
-  const restExprResults = restExprNames.map(compileExpr(parsedArgs, sourceFile, restExprKind));
+  const firstExprResult = compileExpr(parsedArgs, sourceFile, module2, firstExprKind)(firstExprName);
+  const restExprResults = restExprNames.map(compileExpr(parsedArgs, sourceFile, module2, restExprKind));
   return Promise.all([firstExprResult].concat(restExprResults));
 }).catch((err) => {
   emitExternalError(err, sourceFile);
   return [{
-    contract: sourceFile,
+    source: module2.sourceName,
     artifact: `No ${isStorageKind(exprKind) ? "storage" : "parameter"} expressions compiled`
   }];
 }).then(
   (results) => results.length > 0 ? results : [{
-    contract: sourceFile,
+    source: module2.sourceName,
     artifact: `No ${isStorageKind(exprKind) ? "storage" : "parameter"} expressions found`
   }]
-).then(mergeArtifactsOutput(sourceFile));
-var tryLegacyStorageNamingConvention = (parsedArgs, sourceFile) => {
-  const storageListFile = `${removeExt(sourceFile)}.storages${extractExt(sourceFile)}`;
-  const storageListFilename = getInputFilenameAbsPath(parsedArgs, storageListFile);
-  return (0, import_promises2.access)(storageListFilename).then(() => {
-    (0, import_node_sdk3.sendWarn)(
-      `Warning: The naming convention of "<CONTRACT>.storages.<EXTENSION>" is deprecated and renamed to "<CONTRACT>.storageList.<EXTENSION>". Please adjust your storage file names accordingly
-`
-    );
-    return compileExprs(parsedArgs, storageListFile, "storage");
-  });
-};
-var tryLegacyParameterNamingConvention = (parsedArgs, sourceFile) => {
-  const parameterListFile = `${removeExt(sourceFile)}.parameters${extractExt(sourceFile)}`;
-  const parameterListFilename = getInputFilenameAbsPath(parsedArgs, parameterListFile);
-  return (0, import_promises2.access)(parameterListFilename).then(() => {
-    (0, import_node_sdk3.sendWarn)(
-      `Warning: The naming convention of "<CONTRACT>.parameters.<EXTENSION>" is deprecated and renamed to "<CONTRACT>.parameterList.<EXTENSION>". Please adjust your parameter file names accordingly
-`
-    );
-    return compileExprs(parsedArgs, parameterListFile, "parameter");
-  });
-};
-var initContentForStorage = (sourceFile) => {
-  const linkToContract = `#include "${sourceFile}"
+);
+var initContentForStorage = (module2) => {
+  const linkToContract = `#import "${module2.sourceFile}" "Contract"
 
 `;
-  const instruction = "// Define your initial storage values as a list of LIGO variable definitions,\n// the first of which will be considered the default value to be used for origination later on\n";
-  const ext = extractExt(sourceFile);
-  let syntax = "";
-  if (ext === ".ligo")
-    syntax = "// E.g. const aStorageValue : aStorageType = 10;\n\n";
-  else if (ext === ".religo")
-    syntax = "// E.g. let aStorageValue : aStorageType = 10;\n\n";
-  else if (ext === ".mligo")
-    syntax = "// E.g. let aStorageValue : aStorageType = 10\n\n";
-  else if (ext === ".jsligo")
-    syntax = "// E.g. const aStorageValue : aStorageType = 10;\n\n";
-  return linkToContract + instruction + syntax;
+  const instruction = "// Define your initial storage values as a list of LIGO variable definitions, the first of which will be considered the default value to be used for origination later on\n";
+  const syntax = (() => {
+    const pair = [module2.syntax, module2.type].join("-");
+    switch (pair) {
+      case "mligo-file-main":
+        return [
+          "// When this file was created, the smart contract was defined with a main function that was not within a named module. As such, the examples below are written with that assumption in mind.",
+          "",
+          "// If your storage is a simple value, you can define it directly",
+          "// E.g. let storage = 10",
+          "",
+          "// For added type-safety, you can reference the type of your storage from the contract",
+          "// E.g. let storage : Contract.storage = 10"
+        ];
+        break;
+      case "mligo-file-entry":
+        return [
+          "// When this file was created, the smart contract was defined with an entrypoint using `@entry` that was not within a named module. As such, the examples below are written with that assumption in mind.",
+          "",
+          "// If your storage is a simple value, you can define it directly",
+          "// E.g. let storage = 10",
+          "",
+          "// For added type-safety, you can reference the type of your storage from the contract",
+          "// E.g. let storage : Contract.storage = 10"
+        ];
+        break;
+      case "mligo-module-main":
+        return [
+          "// When this file was created, the smart contract was defined with a main function that was within a named module. As such, the examples below are written with that assumption in mind.",
+          "",
+          "// If your storage is a simple value, you can define it directly",
+          "// E.g. let storage = 10",
+          "",
+          "// For added type-safety, you can reference the type of your storage from the contract",
+          `// E.g. let storage : Contract.${module2.moduleName}.storage = 10`
+        ];
+        break;
+      case "mligo-module-entry":
+        return [
+          "// When this file was created, the smart contract was defined with an entrypoint using `@entry` that was within a named module. As such, the examples below are written with that assumption in mind.",
+          "",
+          "// If your storage is a simple value, you can define it directly",
+          "// E.g. let storage = 10",
+          "",
+          "// For added type-safety, you can reference the type of your storage from the contract",
+          `// E.g. let storage : Contract.${module2.moduleName}.storage = 10`
+        ];
+        break;
+      case "jsligo-file-main":
+        return [
+          "// When this file was created, the smart contract was defined with a main function that was not within a namespace. As such, the examples below are written with that assumption in mind.",
+          `// NOTE: The "storage" type should be exported from the contract file (${module2.sourceFile})`,
+          "",
+          "// If your storage is a simple value, you can define it directly",
+          "// E.g. const storage = 10",
+          "",
+          "// For added type-safety, you can reference the type of your storage from the contract. This assumes that you have exported your `storage` type from the contract file.",
+          "// E.g. const storage : Contract.storage = 10"
+        ];
+        break;
+      case "jsligo-file-entry":
+        return [
+          "// When this file was created, the smart contract was defined with an entrypoint using `@entry` that was not within a namespace. As such, the examples below are written with that assumption in mind.",
+          "",
+          "// If your storage is a simple value, you can define it directly",
+          "// E.g. const storage = 10",
+          "",
+          "// For added type-safety, you can reference the type of your storage from the contract. This assumes that you have exported your `storage` type from the contract file.",
+          "// E.g. const storage : Contract.storage = 10"
+        ];
+        break;
+      case "jsligo-module-main":
+        return [
+          "// When this file was created, the smart contract was defined with a main function that was within a namespace. As such, the examples below are written with that assumption in mind.",
+          `// NOTE: The "storage" type should be exported from the contract file (${module2.sourceFile})`,
+          "",
+          "// If your storage is a simple value, you can define it directly",
+          "// E.g. const storage = 10",
+          "",
+          "// For added type-safety, you can reference the type of your storage from the contract. This assumes that you have exported your `storage` type from the contract file.",
+          `// E.g. const storage : Contract.${module2.moduleName}.storage = 10`
+        ];
+        break;
+      case "jsligo-module-entry":
+        return [
+          "// When this file was created, the smart contract was defined with an entrypoint using `@entry` that was within a namespace. As such, the examples below are written with that assumption in mind.",
+          "",
+          "// If your storage is a simple value, you can define it directly",
+          "// E.g. const storage = 10",
+          "",
+          "// For added type-safety, you can reference the type of your storage from the contract. This assumes that you have exported your `storage` type from the contract file.",
+          `// E.g. const storage : Contract.${module2.moduleName}.storage = 10`
+        ];
+        break;
+      default:
+        return [];
+    }
+  })();
+  return linkToContract + instruction + syntax.join("\n");
 };
-var initContentForParameter = (sourceFile) => {
-  const linkToContract = `#include "${sourceFile}"
+var initContentForParameter = (module2) => {
+  const linkToContract = `#import "${module2.sourceFile}" "Contract"
 
 `;
   const instruction = "// Define your parameter values as a list of LIGO variable definitions\n";
-  const ext = extractExt(sourceFile);
-  let syntax = "";
-  if (ext === ".ligo")
-    syntax = "// E.g. const aParameterValue : aParameterType = Increment(1);\n\n";
-  else if (ext === ".religo")
-    syntax = "// E.g. let aParameterValue : aParameterType = (Increment (1));\n\n";
-  else if (ext === ".mligo")
-    syntax = "// E.g. let aParameterValue : aParameterType = Increment 1\n\n";
-  else if (ext === ".jsligo")
-    syntax = "// E.g. const aParameterValue : aParameterType = (Increment (1));\n\n";
-  return linkToContract + instruction + syntax;
+  const syntax = (() => {
+    const pair = [module2.syntax, module2.type].join("-");
+    switch (pair) {
+      case "mligo-file-main":
+        return [
+          "// When this file was created, the smart contract was defined with a main function that was not within a named module. As such, the examples below are written with that assumption in mind.",
+          "",
+          "// If your parameter is a simple value, you can define it directly",
+          "// E.g. let default_parameter = 10",
+          "",
+          "// For added type-safety, you can reference the type of your parameter from the contract",
+          "// E.g. let default_parameter : Contract.parameter = 10"
+        ];
+        break;
+      case "mligo-file-entry":
+        return [
+          "// When this file was created, the smart contract was defined with an entrypoint using `@entry` that was not within a named module. As such, the examples below are written with that assumption in mind.",
+          "",
+          "// If your parameter is a simple value, you can define it directly",
+          "// E.g. let default_parameter = 10",
+          "",
+          "// For added type-safety, you can reference the type of your parameter from the contract",
+          "// E.g. let default_parameter : parameter_of Contract = 10"
+        ];
+        break;
+      case "mligo-module-main":
+        return [
+          "// When this file was created, the smart contract was defined with a main function that was within a named module. As such, the examples below are written with that assumption in mind.",
+          "",
+          "// If your parameter is a simple value, you can define it directly",
+          "// E.g. let default_parameter = 10",
+          "",
+          "// For added type-safety, you can reference the type of your parameter from the contract",
+          `// E.g. let default_parameter : Contract.${module2.moduleName}.parameter = 10`
+        ];
+        break;
+      case "mligo-module-entry":
+        return [
+          "// When this file was created, the smart contract was defined with an entrypoint using `@entry` that was within a named module. As such, the examples below are written with that assumption in mind.",
+          "",
+          "// If your parameter is a simple value, you can define it directly",
+          "// E.g. let default_parameter = 10",
+          "",
+          "// For added type-safety, you can reference the type of your parameter from the contract",
+          `// E.g. let default_parameter : parameter_of Contract.${module2.moduleName} = 10`
+        ];
+        break;
+      case "jsligo-file-main":
+        return [
+          "// When this file was created, the smart contract was defined with a main function that was not within a namespace. As such, the examples below are written with that assumption in mind.",
+          `// NOTE: The "parameter" type should be exported from the contract file (${module2.sourceFile})`,
+          "",
+          "// If your parameter is a simple value, you can define it directly",
+          "// E.g. const default_parameter = 10",
+          "",
+          "// For added type-safety, you can reference the type of your parameter from the contract",
+          "// E.g. const default_parameter : Contract.parameter = 10"
+        ];
+        break;
+      case "jsligo-file-entry":
+        return [
+          "// When this file was created, the smart contract was defined with an entrypoint using `@entry` that was not within a namespace. As such, the examples below are written with that assumption in mind.",
+          "",
+          "// If your parameter is a simple value, you can define it directly",
+          "// E.g. const default_parameter = 10",
+          "",
+          "// For added type-safety, you can reference the type of your parameter from the contract",
+          "// E.g. const default_parameter : parameter_of Contract = 10"
+        ];
+        break;
+      case "jsligo-module-main":
+        return [
+          "// When this file was created, the smart contract was defined with a main function that was within a namespace. As such, the examples below are written with that assumption in mind.",
+          `// NOTE: The "parameter" type should be exported from the contract file (${module2.sourceFile})`,
+          "",
+          "// If your parameter is a simple value, you can define it directly",
+          "// E.g. const default_parameter = 10",
+          "",
+          "// For added type-safety, you can reference the type of your parameter from the contract",
+          `// E.g. const default_parameter : Contract.${module2.moduleName}.parameter = 10`
+        ];
+        break;
+      case "jsligo-module-entry":
+        return [
+          "// When this file was created, the smart contract was defined with an entrypoint using `@entry` that was within a namespace. As such, the examples below are written with that assumption in mind.",
+          "",
+          "// If your parameter is a simple value, you can define it directly",
+          "// E.g. const default_parameter = 10",
+          "",
+          "// For added type-safety, you can reference the type of your parameter from the contract",
+          `// E.g. const default_parameter : parameter_of Contract.${module2.moduleName} = 10`
+        ];
+        break;
+      default:
+        return [];
+    }
+  })();
+  return linkToContract + instruction + syntax.join("\n");
 };
-var compileContractWithStorageAndParameter = async (parsedArgs, sourceFile) => {
-  const contractCompileResult = await compileContract(parsedArgs, sourceFile);
+var compileContractWithStorageAndParameter = async (parsedArgs, sourceFile, module2) => {
+  const contractCompileResult = await compileContract(parsedArgs, sourceFile, module2);
   if (contractCompileResult.artifact === COMPILE_ERR_MSG)
     return [contractCompileResult];
-  const storageListFile = `${removeExt(sourceFile)}.storageList${extractExt(sourceFile)}`;
+  const storageListFile = `${module2.moduleName}.storageList${extractExt(sourceFile)}`;
   const storageListFilename = getInputFilenameAbsPath(parsedArgs, storageListFile);
-  const storageCompileResult = await (0, import_promises2.access)(storageListFilename).then(() => compileExprs(parsedArgs, storageListFile, "storage")).catch(() => tryLegacyStorageNamingConvention(parsedArgs, sourceFile)).catch(() => {
+  const storageCompileResult = await (0, import_promises2.access)(storageListFilename).then(() => compileExprs(parsedArgs, storageListFile, module2, "storage")).catch(() => {
     (0, import_node_sdk3.sendWarn)(
-      `Note: storage file associated with "${sourceFile}" can't be found, so "${storageListFile}" has been created for you. Use this file to define all initial storage values for this contract
+      `Note: storage file associated with "${module2.moduleName}" can't be found, so "${storageListFile}" has been created for you. Use this file to define all initial storage values for this contract
 `
     );
-    (0, import_promises2.writeFile)(storageListFilename, initContentForStorage(sourceFile), "utf8");
+    return (0, import_promises2.writeFile)(storageListFilename, initContentForStorage(module2), "utf8");
   });
-  const parameterListFile = `${removeExt(sourceFile)}.parameterList${extractExt(sourceFile)}`;
+  const parameterListFile = `${module2.moduleName}.parameterList${extractExt(sourceFile)}`;
   const parameterListFilename = getInputFilenameAbsPath(parsedArgs, parameterListFile);
-  const parameterCompileResult = await (0, import_promises2.access)(parameterListFilename).then(() => compileExprs(parsedArgs, parameterListFile, "parameter")).catch(() => tryLegacyParameterNamingConvention(parsedArgs, sourceFile)).catch(() => {
+  const parameterCompileResult = await (0, import_promises2.access)(parameterListFilename).then(() => compileExprs(parsedArgs, parameterListFile, module2, "parameter")).catch(() => {
     (0, import_node_sdk3.sendWarn)(
-      `Note: parameter file associated with "${sourceFile}" can't be found, so "${parameterListFile}" has been created for you. Use this file to define all parameter values for this contract
+      `Note: parameter file associated with "${module2.moduleName}" can't be found, so "${parameterListFile}" has been created for you. Use this file to define all parameter values for this contract
 `
     );
-    (0, import_promises2.writeFile)(parameterListFilename, initContentForParameter(sourceFile), "utf8");
+    return (0, import_promises2.writeFile)(parameterListFilename, initContentForParameter(module2), "utf8");
   });
-  let compileResults = [contractCompileResult];
-  if (storageCompileResult)
-    compileResults = compileResults.concat(storageCompileResult);
-  if (parameterCompileResult)
-    compileResults = compileResults.concat(parameterCompileResult);
-  return compileResults;
-};
-var mergeArtifactsOutput = (sourceFile) => (tableRows) => {
-  const artifactsOutput = tableRows.reduce(
-    (acc, row) => row.artifact === COMPILE_ERR_MSG ? acc : `${acc}${row.artifact}
-`,
-    ""
-  );
-  return [{
-    contract: sourceFile,
-    artifact: artifactsOutput
-  }];
+  const storageArtifacts = storageCompileResult ? storageCompileResult.map((res) => res.artifact).join("\n") : "";
+  const parameterArtifacts = parameterCompileResult ? parameterCompileResult.map((res) => res.artifact).join("\n") : "";
+  const combinedArtifact = [
+    contractCompileResult.artifact,
+    storageArtifacts,
+    parameterArtifacts
+  ].filter(Boolean).join("\n");
+  const combinedRow = {
+    source: module2.sourceName,
+    artifact: combinedArtifact
+  };
+  return [combinedRow];
 };
-var compile = (parsedArgs) => {
+var compile = async (parsedArgs) => {
   const sourceFile = parsedArgs.sourceFile;
-  let p;
-  if (isStorageListFile(sourceFile))
-    p = compileExprs(parsedArgs, sourceFile, "storage");
-  else if (isParameterListFile(sourceFile))
-    p = compileExprs(parsedArgs, sourceFile, "parameter");
-  else if (isContractFile(sourceFile))
-    p = compileContractWithStorageAndParameter(parsedArgs, sourceFile);
-  else {
-    return (0, import_node_sdk3.sendAsyncErr)(
-      `${sourceFile} doesn't have a valid LIGO extension ('.ligo', '.religo', '.mligo' or '.jsligo')`
-    );
+  if (!isLIGOFile(sourceFile)) {
+    (0, import_node_sdk3.sendErr)(`${sourceFile} is not a LIGO file`);
+    return;
+  }
+  if (isStorageListFile(sourceFile) || isParameterListFile(sourceFile)) {
+    (0, import_node_sdk3.sendErr)(`Storage and parameter list files are not meant to be compiled directly`);
+    return;
+  }
+  if (isUnsupportedLigoSyntax(sourceFile)) {
+    (0, import_node_sdk3.sendErr)(`Unsupported LIGO syntax detected in ${sourceFile}. Note, we only support .jsligo and .mligo files.`);
+    return;
+  }
+  try {
+    const modules = await listContractModules(parsedArgs, sourceFile);
+    if (modules.length === 0) {
+      return (0, import_node_sdk3.sendJsonRes)([
+        {
+          source: sourceFile,
+          artifact: `No contract modules found in "${sourceFile}"`
+        }
+      ]);
+    }
+    let allCompileResults = [];
+    for (const module2 of modules) {
+      if (parsedArgs.module && parsedArgs.module !== module2.moduleName)
+        continue;
+      const compileResults = await compileContractWithStorageAndParameter(parsedArgs, sourceFile, module2);
+      allCompileResults = allCompileResults.concat(compileResults);
+    }
+    (0, import_node_sdk3.sendJsonRes)(allCompileResults, { footer: `
+Compiled ${allCompileResults.length} contract(s) in "${sourceFile}"` });
+  } catch (err) {
+    (0, import_node_sdk3.sendErr)(`Error processing "${sourceFile}": ${err}`);
   }
-  return p.then(import_node_sdk3.sendJsonRes).catch((err) => (0, import_node_sdk3.sendErr)(err, false));
 };
 var compile_default = compile;
 
 // compile-all.ts
 var import_node_sdk4 = require("@taqueria/node-sdk");
 var import_fast_glob = __toESM(require("fast-glob"));
-var import_promises3 = require("fs/promises");
 var import_path3 = require("path");
-var isMainContract = async (parsedArgs, contractFilename) => {
-  if (/storageList\.\w{0,2}ligo$/.test(contractFilename))
-    return false;
-  const fileContent = await (0, import_promises3.readFile)(getInputFilenameAbsPath(parsedArgs, contractFilename), "utf8");
-  const entryOrMainFunctionRegex = /@entry|((const|let|function)\s+main)/g;
-  return entryOrMainFunctionRegex.test(fileContent);
-};
-var parseIncludes = async (parsedArgs, contractFilename) => {
-  const fileContent = await (0, import_promises3.readFile)(getInputFilenameAbsPath(parsedArgs, contractFilename), "utf8");
-  const includeRegex = /#include\s+"([^"]+\.m?ligo)"/g;
-  let match;
-  const includes = [];
-  while ((match = includeRegex.exec(fileContent)) !== null) {
-    includes.push(match[1]);
-  }
-  return includes;
-};
-var buildDependencyGraph = async (parsedArgs, contractFilenames) => {
-  const graph = /* @__PURE__ */ new Map();
-  for (const filename of contractFilenames) {
-    const includes = await parseIncludes(parsedArgs, filename);
-    graph.set(filename, new Set(includes));
-  }
-  return graph;
-};
-var visit = (node, graph, visited, stack) => {
-  if (stack.has(node))
-    return [true, visited];
-  if (!visited.has(node)) {
-    const newVisited = new Set(visited).add(node);
-    const newStack = new Set(stack).add(node);
-    const [circular, updatedVisited] = Array.from(graph.get(node) || []).reduce(
-      ([circularFound, vSet], dependency) => {
-        const [result, v] = visit(dependency, graph, vSet, newStack);
-        return [circularFound || result, v];
-      },
-      [false, newVisited]
-    );
-    if (!circular)
-      return [false, updatedVisited];
-  }
-  return [false, visited];
-};
-var detectCircularDependencies = (graph) => {
-  const { safeFiles, circularFiles, visited } = Array.from(graph.keys()).reduce(
-    (acc, filename) => {
-      const [isCircular, updatedVisited] = visit(
-        filename,
-        graph,
-        acc.visited,
-        /* @__PURE__ */ new Set()
-      );
-      if (isCircular) {
-        acc.circularFiles.push(filename);
-      } else {
-        acc.safeFiles.push(filename);
-      }
-      acc.visited = updatedVisited;
-      return acc;
-    },
-    { safeFiles: [], circularFiles: [], visited: /* @__PURE__ */ new Set() }
-  );
-  return { safeFiles, circularFiles };
-};
 var compileAll = async (parsedArgs) => {
-  let p = [];
+  let compilePromises = [];
   const contractFilenames = await (0, import_fast_glob.default)(
     ["**/*.ligo", "**/*.religo", "**/*.mligo", "**/*.jsligo"],
     {
@@ -508,22 +575,15 @@ var compileAll = async (parsedArgs) => {
       absolute: false
     }
   );
-  const dependencyGraph = await buildDependencyGraph(parsedArgs, contractFilenames);
-  const { safeFiles, circularFiles } = detectCircularDependencies(dependencyGraph);
-  for (const filename of safeFiles) {
-    if (await isMainContract(parsedArgs, filename)) {
-      p.push(compileContractWithStorageAndParameter(parsedArgs, filename));
+  for (const filename of contractFilenames) {
+    if (isStorageListFile(filename) || isParameterListFile(filename))
+      continue;
+    const moduleNames = await listContractModules(parsedArgs, filename);
+    for (const moduleName of moduleNames) {
+      compilePromises.push(compileContractWithStorageAndParameter(parsedArgs, filename, moduleName));
     }
   }
-  return Promise.all(p).then((tables) => tables.flat()).then((table) => {
-    if (circularFiles.length > 0) {
-      console.warn(
-        "Warning: Circular dependencies detected in the following files. They have been skipped:"
-      );
-      console.warn(circularFiles.join(", "));
-    }
-    return table;
-  }).then(import_node_sdk4.sendJsonRes).catch((err) => (0, import_node_sdk4.sendErr)(err, false));
+  return Promise.all(compilePromises).then((tables) => tables.flat()).then(import_node_sdk4.sendJsonRes).catch((err) => (0, import_node_sdk4.sendErr)(err, false));
 };
 var compile_all_default = compileAll;
 
@@ -551,7 +611,7 @@ var getArbitraryLigoCmd = (parsedArgs, uid, gid, userArgs) => {
   const processedUserArgs = userArgs.split(" ").map((arg) => arg.startsWith("\\-") ? arg.substring(1) : arg).filter(
     (arg) => arg
   );
-  const args = baseArgs.concat(processedUserArgs);
+  const args = [...baseArgs, ...processedUserArgs, "--skip-analytics"];
   const envVars = { "DOCKER_DEFAULT_PLATFORM": "linux/amd64" };
   return [
     [binary, ...args].join(" "),
@@ -668,6 +728,12 @@ import_node_sdk9.Plugin.create((i18n) => ({
           flag: "json",
           boolean: true,
           description: "Emit JSON-encoded Michelson"
+        }),
+        import_node_sdk9.Option.create({
+          flag: "module",
+          shortFlag: "m",
+          type: "string",
+          description: "The LIGO module to be compiled"
         })
       ],
       handler: "proxy",
@@ -725,6 +791,7 @@ import_node_sdk9.Plugin.create((i18n) => ({
       handler: createContract_default
     })
   ],
-  proxy: main_default
+  proxy: main_default,
+  postInstall: `node ${__dirname}/postinstall.js`
 }), process.argv);
 //# sourceMappingURL=index.js.map