@algorandfoundation/algokit-utils 1.0.0-beta.4 → 1.0.0-beta.40

package/{dist/deploy-app.js → app-deploy.js}

@@ -1,88 +1,81 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.performTemplateSubstitutionAndCompile = exports.replaceDeployTimeControlParams = exports.getAppDeploymentTransactionNote = exports.getCreatorAppsByName = exports.schemaIsBroken = exports.deployApp = exports.OnSchemaBreak = exports.OnUpdate = exports.APP_DEPLOY_NOTE_PREFIX = exports.DELETABLE_TEMPLATE_NAME = exports.UPDATABLE_TEMPLATE_NAME = void 0;
+exports.performTemplateSubstitutionAndCompile = exports.performTemplateSubstitution = exports.replaceDeployTimeControlParams = exports.getAppDeploymentTransactionNote = exports.getCreatorAppsByName = exports.isSchemaIsBroken = exports.deployApp = void 0;
 const algosdk_1 = require("algosdk");
+const _1 = require(".");
 const app_1 = require("./app");
-const config_1 = require("./config");
 const indexer_lookup_1 = require("./indexer-lookup");
 const transaction_1 = require("./transaction");
-exports.UPDATABLE_TEMPLATE_NAME = 'TMPL_UPDATABLE';
-exports.DELETABLE_TEMPLATE_NAME = 'TMPL_DELETABLE';
-exports.APP_DEPLOY_NOTE_PREFIX = 'APP_DEPLOY::';
-/** What action to perform when deploying an app and an update is detected in the TEAL code */
-var OnUpdate;
-(function (OnUpdate) {
-    /** Fail the deployment */
-    OnUpdate[OnUpdate["Fail"] = 0] = "Fail";
-    /** Update the app */
-    OnUpdate[OnUpdate["UpdateApp"] = 1] = "UpdateApp";
-    /** Delete the app and create a new one in its place */
-    OnUpdate[OnUpdate["ReplaceApp"] = 2] = "ReplaceApp";
-})(OnUpdate = exports.OnUpdate || (exports.OnUpdate = {}));
-/** What action to perform when deploying an app and a breaking schema change is detected */
-var OnSchemaBreak;
-(function (OnSchemaBreak) {
-    /** Fail the deployment */
-    OnSchemaBreak[OnSchemaBreak["Fail"] = 0] = "Fail";
-    /** Delete the app and create a new one in its place */
-    OnSchemaBreak[OnSchemaBreak["ReplaceApp"] = 1] = "ReplaceApp";
-})(OnSchemaBreak = exports.OnSchemaBreak || (exports.OnSchemaBreak = {}));
+const app_2 = require("./types/app");
 /**
  * Idempotently deploy (create, update/delete if changed) an app against the given name via the given creator account, including deploy-time template placeholder substitutions.
  *
- * To understand the architecture decisions behind this functionality please @see https://github.com/algorandfoundation/algokit-cli/blob/main/docs/architecture-decisions/2023-01-12_smart-contract-deployment.md
+ * To understand the architecture decisions behind this functionality please see https://github.com/algorandfoundation/algokit-cli/blob/main/docs/architecture-decisions/2023-01-12_smart-contract-deployment.md
  *
- * **Note:** if there is a breaking state schema change to an existing app (and `onSchemaBreak` is set to `'delete'`) the existing app will be deleted and re-created.
+ * **Note:** When using the return from this function be sure to check `operationPerformed` to get access to various return properties like `transaction`, `confirmation` and `deleteResult`.
  *
- * **Note:** if there is an update (different TEAL code) to an existing app (and `onUpdate` is set to `'delete'`) the existing app will be deleted and re-created.
- * @param deployment The arguments to control the app deployment, including:
+ * **Note:** if there is a breaking state schema change to an existing app (and `onSchemaBreak` is set to `'replace'`) the existing app will be deleted and re-created.
+ *
+ * **Note:** if there is an update (different TEAL code) to an existing app (and `onUpdate` is set to `'replace'`) the existing app will be deleted and re-created.
+ * @param deployment The arguments to control the app deployment
  * @param algod An algod client
- * @param indexer An indexer client
+ * @param indexer An indexer client, needed if `existingDeployments` not passed in
  * @returns The app reference of the new/existing app
  */
 async function deployApp(deployment, algod, indexer) {
-    const { metadata, deployTimeParameters, onSchemaBreak, onUpdate, existingDeployments, createArgs, updateArgs, deleteArgs, ...appParams } = deployment;
+    const { metadata, deployTimeParams: deployTimeParameters, onSchemaBreak, onUpdate, existingDeployments, createArgs, updateArgs, deleteArgs, ...appParams } = deployment;
     if (existingDeployments && existingDeployments.creator !== (0, transaction_1.getSenderAddress)(appParams.from)) {
         throw new Error(`Received invalid existingDeployments value for creator ${existingDeployments.creator} when attempting to deploy for creator ${appParams.from}`);
     }
-    config_1.AlgoKitConfig.getLogger(appParams.suppressLog).info(`Idempotently deploying app "${metadata.name}" from creator ${(0, transaction_1.getSenderAddress)(appParams.from)} using ${appParams.approvalProgram.length} bytes of teal code and ${appParams.clearStateProgram.length} bytes of teal code`);
-    appParams.approvalProgram =
-        typeof appParams.approvalProgram === 'string'
-            ? (await performTemplateSubstitutionAndCompile(appParams.approvalProgram, algod, deployTimeParameters, metadata))
-                .compiledBase64ToBytes
-            : appParams.approvalProgram;
-    appParams.clearStateProgram =
-        typeof appParams.clearStateProgram === 'string'
-            ? (await performTemplateSubstitutionAndCompile(appParams.clearStateProgram, algod, deployTimeParameters)).compiledBase64ToBytes
-            : appParams.clearStateProgram;
+    if (!existingDeployments && !indexer) {
+        throw new Error(`Didn't receive an indexer client, but also didn't receive an existingDeployments cache - one of them must be provided`);
+    }
+    _1.Config.getLogger(appParams.suppressLog).info(`Idempotently deploying app "${metadata.name}" from creator ${(0, transaction_1.getSenderAddress)(appParams.from)} using ${appParams.approvalProgram.length} bytes of teal code and ${appParams.clearStateProgram.length} bytes of teal code`);
+    const compiledApproval = typeof appParams.approvalProgram === 'string'
+        ? await performTemplateSubstitutionAndCompile(appParams.approvalProgram, algod, deployTimeParameters, metadata)
+        : undefined;
+    appParams.approvalProgram = compiledApproval ? compiledApproval.compiledBase64ToBytes : appParams.approvalProgram;
+    const compiledClear = typeof appParams.clearStateProgram === 'string'
+        ? await performTemplateSubstitutionAndCompile(appParams.clearStateProgram, algod, deployTimeParameters)
+        : undefined;
+    appParams.clearStateProgram = compiledClear ? compiledClear.compiledBase64ToBytes : appParams.clearStateProgram;
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const apps = existingDeployments ?? (await getCreatorAppsByName(appParams.from, indexer));
-    const create = async (skipSending) => {
+    const create = async (atc) => {
         const result = await (0, app_1.createApp)({
             ...appParams,
             args: createArgs,
             note: getAppDeploymentTransactionNote(metadata),
-            skipSending: skipSending ?? false,
+            atc,
             skipWaiting: false,
         }, algod);
         return {
             transaction: result.transaction,
+            transactions: result.transactions,
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             confirmation: result.confirmation,
-            appIndex: result.appIndex,
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            confirmations: result.confirmations,
+            return: result.return,
+            appId: result.appId,
             appAddress: result.appAddress,
             createdMetadata: metadata,
             createdRound: Number(result.confirmation?.['confirmed-round']),
             updatedRound: Number(result.confirmation?.['confirmed-round']),
             ...metadata,
             deleted: false,
+            operationPerformed: 'create',
+            compiledApproval,
+            compiledClear,
         };
     };
     const existingApp = apps.apps[metadata.name];
-    if (!existingApp) {
-        config_1.AlgoKitConfig.getLogger(appParams.suppressLog).info(`App ${metadata.name} not found in apps created by ${(0, transaction_1.getSenderAddress)(appParams.from)}; deploying app with version ${metadata.version}.`);
+    if (!existingApp || existingApp.deleted) {
+        _1.Config.getLogger(appParams.suppressLog).info(`App ${metadata.name} not found in apps created by ${(0, transaction_1.getSenderAddress)(appParams.from)}; deploying app with version ${metadata.version}.`);
         return await create();
     }
-    config_1.AlgoKitConfig.getLogger(appParams.suppressLog).info(`Existing app ${metadata.name} found by creator ${(0, transaction_1.getSenderAddress)(appParams.from)}, with app index ${existingApp.appIndex} and version ${existingApp.version}.`);
-    const existingAppRecord = await (0, app_1.getAppByIndex)(existingApp.appIndex, algod);
+    _1.Config.getLogger(appParams.suppressLog).info(`Existing app ${metadata.name} found by creator ${(0, transaction_1.getSenderAddress)(appParams.from)}, with app id ${existingApp.appId} and version ${existingApp.version}.`);
+    const existingAppRecord = await (0, app_1.getAppById)(existingApp.appId, algod);
     const existingApproval = existingAppRecord.params['approval-program'];
     const existingClear = existingAppRecord.params['clear-state-program'];
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -100,34 +93,28 @@ async function deployApp(deployment, algod, indexer) {
     const newApproval = Buffer.from(appParams.approvalProgram).toString('base64');
     const newClear = Buffer.from(appParams.clearStateProgram).toString('base64');
     const isUpdate = newApproval !== existingApproval || newClear !== existingClear;
-    const isSchemaBreak = schemaIsBroken(existingGlobalSchema, newGlobalSchema) || schemaIsBroken(existingLocalSchema, newLocalSchema);
+    const isSchemaBreak = isSchemaIsBroken(existingGlobalSchema, newGlobalSchema) || isSchemaIsBroken(existingLocalSchema, newLocalSchema);
     const replace = async () => {
+        const atc = new algosdk_1.AtomicTransactionComposer();
         // Create
-        config_1.AlgoKitConfig.getLogger(appParams.suppressLog).info(`Deploying a new ${metadata.name} app for ${(0, transaction_1.getSenderAddress)(appParams.from)}; deploying app with version ${metadata.version}.`);
-        const { transaction: createTransaction, ...newApp } = await create(true);
+        _1.Config.getLogger(appParams.suppressLog).info(`Deploying a new ${metadata.name} app for ${(0, transaction_1.getSenderAddress)(appParams.from)}; deploying app with version ${metadata.version}.`);
+        const { transaction: createTransaction } = await create(atc);
+        const createTransactions = atc.clone().buildGroup();
         // Delete
-        config_1.AlgoKitConfig.getLogger(appParams.suppressLog).warn(`Deleting existing ${metadata.name} app with index ${existingApp.appIndex} from ${(0, transaction_1.getSenderAddress)(appParams.from)} account.`);
+        _1.Config.getLogger(appParams.suppressLog).warn(`Deleting existing ${metadata.name} app with id ${existingApp.appId} from ${(0, transaction_1.getSenderAddress)(appParams.from)} account.`);
         const { transaction: deleteTransaction } = await (0, app_1.callApp)({
-            appIndex: existingApp.appIndex,
+            appId: existingApp.appId,
             callType: 'delete',
             from: appParams.from,
             args: deleteArgs,
             transactionParams: appParams.transactionParams,
             suppressLog: appParams.suppressLog,
             skipSending: true,
+            atc,
         }, algod);
         // Ensure create and delete happen atomically
-        const { confirmations } = await (0, transaction_1.sendGroupOfTransactions)({
-            transactions: [
-                {
-                    transaction: createTransaction,
-                    signer: appParams.from,
-                },
-                {
-                    transaction: deleteTransaction,
-                    signer: appParams.from,
-                },
-            ],
+        const { transactions, confirmations, returns } = await (0, transaction_1.sendAtomicTransactionComposer)({
+            atc,
             sendParams: {
                 maxRoundsToWaitForConfirmation: appParams.maxRoundsToWaitForConfirmation,
                 skipWaiting: false,
@@ -135,16 +122,22 @@ async function deployApp(deployment, algod, indexer) {
             },
         }, algod);
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const createConfirmation = confirmations[0];
+        const createConfirmation = confirmations[createTransactions.length - 1];
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const deleteConfirmation = confirmations[1];
+        const deleteConfirmation = confirmations[confirmations.length - 1];
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const newAppIndex = createConfirmation['application-index'];
-        config_1.AlgoKitConfig.getLogger(appParams.suppressLog).warn(`Sent transactions ${createTransaction.txID()} to create app with index ${newAppIndex} and ${deleteTransaction.txID()} to delete app with index ${existingApp.appIndex} from ${(0, transaction_1.getSenderAddress)(appParams.from)} account.`);
+        _1.Config.getLogger(appParams.suppressLog).warn(`Sent transactions ${createTransaction.txID()} to create app with id ${newAppIndex} and ${deleteTransaction.txID()} to delete app with id ${existingApp.appId} from ${(0, transaction_1.getSenderAddress)(appParams.from)} account.`);
         return {
             transaction: createTransaction,
+            transactions: transactions,
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             confirmation: createConfirmation,
-            appIndex: newAppIndex,
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            confirmations: confirmations,
+            return: returns?.[0],
+            deleteReturn: returns?.[1],
+            appId: newAppIndex,
             appAddress: (0, algosdk_1.getApplicationAddress)(newAppIndex),
             createdMetadata: metadata,
             createdRound: Number(createConfirmation['confirmed-round']),
@@ -152,12 +145,15 @@ async function deployApp(deployment, algod, indexer) {
             ...metadata,
             deleted: false,
             deleteResult: { transaction: deleteTransaction, confirmation: deleteConfirmation },
+            operationPerformed: 'replace',
+            compiledApproval,
+            compiledClear,
         };
     };
     const update = async () => {
-        config_1.AlgoKitConfig.getLogger(appParams.suppressLog).info(`Updating existing ${metadata.name} app for ${(0, transaction_1.getSenderAddress)(appParams.from)} to version ${metadata.version}.`);
+        _1.Config.getLogger(appParams.suppressLog).info(`Updating existing ${metadata.name} app for ${(0, transaction_1.getSenderAddress)(appParams.from)} to version ${metadata.version}.`);
         const result = await (0, app_1.updateApp)({
-            appIndex: existingApp.appIndex,
+            appId: existingApp.appId,
             from: appParams.from,
             args: updateArgs,
             note: getAppDeploymentTransactionNote(metadata),
@@ -170,18 +166,26 @@ async function deployApp(deployment, algod, indexer) {
         }, algod);
         return {
             transaction: result.transaction,
+            transactions: result.transactions,
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             confirmation: result.confirmation,
-            appIndex: existingApp.appIndex,
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            confirmations: result.confirmations,
+            return: result.return,
+            appId: existingApp.appId,
             appAddress: existingApp.appAddress,
             createdMetadata: existingApp.createdMetadata,
             createdRound: existingApp.createdRound,
             updatedRound: Number(result.confirmation?.['confirmed-round']),
             ...metadata,
             deleted: false,
+            operationPerformed: 'update',
+            compiledApproval,
+            compiledClear,
         };
     };
     if (isSchemaBreak) {
-        config_1.AlgoKitConfig.getLogger(appParams.suppressLog).warn(`Detected a breaking app schema change in app ${existingApp.appIndex}:`, {
+        _1.Config.getLogger(appParams.suppressLog).warn(`Detected a breaking app schema change in app ${existingApp.appId}:`, {
             from: {
                 global: existingGlobalSchema,
                 local: existingLocalSchema,
@@ -191,47 +195,47 @@ async function deployApp(deployment, algod, indexer) {
                 local: newLocalSchema,
             },
         });
-        if (onSchemaBreak === undefined || onSchemaBreak === 'fail' || onSchemaBreak === OnSchemaBreak.Fail) {
+        if (onSchemaBreak === undefined || onSchemaBreak === 'fail' || onSchemaBreak === app_2.OnSchemaBreak.Fail) {
             throw new Error('Schema break detected and onSchemaBreak=OnSchemaBreak.Fail, stopping deployment. ' +
                 'If you want to try deleting and recreating the app then ' +
                 're-run with onSchemaBreak=OnSchemaBreak.ReplaceApp');
         }
         if (existingApp.deletable) {
-            config_1.AlgoKitConfig.getLogger(appParams.suppressLog).info('App is deletable and onSchemaBreak=ReplaceApp, will attempt to create new app and delete old app');
+            _1.Config.getLogger(appParams.suppressLog).info('App is deletable and onSchemaBreak=ReplaceApp, will attempt to create new app and delete old app');
         }
         else {
-            config_1.AlgoKitConfig.getLogger(appParams.suppressLog).info('App is not deletable but onSchemaBreak=ReplaceApp, will attempt to delete app, delete will most likely fail');
+            _1.Config.getLogger(appParams.suppressLog).info('App is not deletable but onSchemaBreak=ReplaceApp, will attempt to delete app, delete will most likely fail');
         }
         return await replace();
     }
     if (isUpdate) {
-        config_1.AlgoKitConfig.getLogger(appParams.suppressLog).info(`Detected a TEAL update in app ${existingApp.appIndex} for creator ${(0, transaction_1.getSenderAddress)(appParams.from)}`);
-        if (onUpdate === undefined || onUpdate === 'fail' || onUpdate === OnUpdate.Fail) {
+        _1.Config.getLogger(appParams.suppressLog).info(`Detected a TEAL update in app ${existingApp.appId} for creator ${(0, transaction_1.getSenderAddress)(appParams.from)}`);
+        if (onUpdate === undefined || onUpdate === 'fail' || onUpdate === app_2.OnUpdate.Fail) {
             throw new Error('Update detected and onUpdate=Fail, stopping deployment. ' +
                 'If you want to try deleting and recreating the app then ' +
                 're-run with onUpdate=UpdateApp');
         }
-        if (onUpdate === 'update' || onUpdate === OnUpdate.UpdateApp) {
+        if (onUpdate === 'update' || onUpdate === app_2.OnUpdate.UpdateApp) {
             if (existingApp.updatable) {
-                config_1.AlgoKitConfig.getLogger(appParams.suppressLog).info(`App is updatable and onUpdate=UpdateApp, updating app...`);
+                _1.Config.getLogger(appParams.suppressLog).info(`App is updatable and onUpdate=UpdateApp, updating app...`);
             }
             else {
-                config_1.AlgoKitConfig.getLogger(appParams.suppressLog).warn(`App is not updatable but onUpdate=UpdateApp, will attempt to update app, update will most likely fail`);
+                _1.Config.getLogger(appParams.suppressLog).warn(`App is not updatable but onUpdate=UpdateApp, will attempt to update app, update will most likely fail`);
             }
             return await update();
         }
-        if (onUpdate === 'replace' || onUpdate === OnUpdate.ReplaceApp) {
+        if (onUpdate === 'replace' || onUpdate === app_2.OnUpdate.ReplaceApp) {
             if (existingApp.deletable) {
-                config_1.AlgoKitConfig.getLogger(appParams.suppressLog).warn('App is deletable and onUpdate=ReplaceApp, creating new app and deleting old app...');
+                _1.Config.getLogger(appParams.suppressLog).warn('App is deletable and onUpdate=ReplaceApp, creating new app and deleting old app...');
             }
             else {
-                config_1.AlgoKitConfig.getLogger(appParams.suppressLog).warn('App is not deletable and onUpdate=ReplaceApp, will attempt to create new app and delete old app, delete will most likely fail');
+                _1.Config.getLogger(appParams.suppressLog).warn('App is not deletable and onUpdate=ReplaceApp, will attempt to create new app and delete old app, delete will most likely fail');
             }
             return await replace();
         }
     }
-    config_1.AlgoKitConfig.getLogger(appParams.suppressLog).debug('No detected changes in app, nothing to do.');
-    return existingApp;
+    _1.Config.getLogger(appParams.suppressLog).debug('No detected changes in app, nothing to do.');
+    return { ...existingApp, operationPerformed: 'nothing', compiledApproval, compiledClear };
 }
 exports.deployApp = deployApp;
 /** Returns true is there is a breaking change in the application state schema from before to after.
@@ -242,12 +246,12 @@ exports.deployApp = deployApp;
  * @param after The new schema
  * @returns Whether or not there is a breaking change
  */
-function schemaIsBroken(before, after) {
+function isSchemaIsBroken(before, after) {
     return before['num-byte-slice'] < after['num-byte-slice'] || before['num-uint'] < after['num-uint'];
 }
-exports.schemaIsBroken = schemaIsBroken;
+exports.isSchemaIsBroken = isSchemaIsBroken;
 /**
- * Returns a lookup of name => app metadata (id, address, ...metadata) for all apps created by the given account that have an @see {AppDeployNote} in the transaction note of the creation transaction.
+ * Returns a lookup of name => app metadata (id, address, ...metadata) for all apps created by the given account that have an `AppDeployNote` in the transaction note of the creation transaction.
  *
  * **Note:** It's recommended this is only called once and then stored since it's a somewhat expensive operation (multiple indexer calls).
  *
@@ -259,12 +263,14 @@ async function getCreatorAppsByName(creatorAccount, indexer) {
     const appLookup = {};
     const creatorAddress = typeof creatorAccount !== 'string' ? (0, transaction_1.getSenderAddress)(creatorAccount) : creatorAccount;
     // Extract all apps that account created
-    const createdApps = (await (0, indexer_lookup_1.lookupAccountCreatedApplicationByAddress)(indexer, creatorAddress)).map((a) => {
+    const createdApps = (await (0, indexer_lookup_1.lookupAccountCreatedApplicationByAddress)(indexer, creatorAddress))
+        .map((a) => {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         return { id: a.id, createdAtRound: a['created-at-round'], deleted: a.deleted };
-    });
+    })
+        .sort((a, b) => a.createdAtRound - b.createdAtRound);
     // For each app that account created (in parallel)...
-    await Promise.all(createdApps.map(async (createdApp) => {
+    const apps = await Promise.all(createdApps.map(async (createdApp) => {
         // Find any app transactions for that app in the round it was created (should always just be a single creation transaction)
         const appTransactions = await (0, indexer_lookup_1.searchTransactions)(indexer, (s) => s
             .minRound(createdApp.createdAtRound)
@@ -272,7 +278,7 @@ async function getCreatorAppsByName(creatorAccount, indexer) {
             .applicationID(createdApp.id)
             .address(creatorAddress)
             .addressRole('sender')
-            .notePrefix(Buffer.from(exports.APP_DEPLOY_NOTE_PREFIX).toString('base64')));
+            .notePrefix(Buffer.from(app_2.APP_DEPLOY_NOTE_DAPP).toString('base64')));
         // Triple check the transaction is intact by filtering for the one we want:
         //  * application-id is 0 when the app is first created
         //  * also verify the sender to prevent a potential security risk
@@ -288,7 +294,14 @@ async function getCreatorAppsByName(creatorAccount, indexer) {
                 b['confirmed-round'] - a['confirmed-round'])[0];
         if (!appCreationTransaction?.note)
             // No note; ignoring
-            return;
+            return null;
+        return { createdApp, appCreationTransaction, latestAppUpdateTransaction };
+    }));
+    apps
+        .filter((a) => a !== null)
+        .forEach((a) => {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const { createdApp, appCreationTransaction, latestAppUpdateTransaction } = a;
         const parseNote = (note) => {
             if (!note) {
                 // No note; ignoring...
@@ -297,17 +310,17 @@ async function getCreatorAppsByName(creatorAccount, indexer) {
             const decoder = new TextDecoder();
             const noteAsBase64 = decoder.decode(Buffer.from(note));
             const noteAsString = Buffer.from(noteAsBase64, 'base64').toString('utf-8');
-            if (!noteAsString.startsWith(`${exports.APP_DEPLOY_NOTE_PREFIX}{`))
+            if (!noteAsString.startsWith(`${app_2.APP_DEPLOY_NOTE_DAPP}:j{`))
                 // Clearly not APP_DEPLOY JSON; ignoring...
                 return;
-            return JSON.parse(noteAsString.substring(exports.APP_DEPLOY_NOTE_PREFIX.length));
+            return JSON.parse(noteAsString.substring(app_2.APP_DEPLOY_NOTE_DAPP.length + 2));
         };
         try {
             const creationNote = parseNote(appCreationTransaction.note);
             const updateNote = parseNote(latestAppUpdateTransaction.note);
             if (creationNote?.name) {
                 appLookup[creationNote.name] = {
-                    appIndex: createdApp.id,
+                    appId: createdApp.id,
                     appAddress: (0, algosdk_1.getApplicationAddress)(createdApp.id),
                     createdMetadata: creationNote,
                     createdRound: Number(appCreationTransaction['confirmed-round']),
@@ -318,10 +331,10 @@ async function getCreatorAppsByName(creatorAccount, indexer) {
             }
         }
         catch (e) {
-            config_1.AlgoKitConfig.logger.warn(`Received error trying to retrieve app with ${createdApp.id} for creator ${creatorAddress}; failing silently`, e);
+            _1.Config.logger.warn(`Received error trying to retrieve app with ${createdApp.id} for creator ${creatorAddress}; failing silently`, e);
             return;
         }
-    }));
+    });
     return {
         creator: creatorAddress,
         apps: appLookup,
@@ -334,42 +347,56 @@ exports.getCreatorAppsByName = getCreatorAppsByName;
  * @returns The transaction note as a utf-8 string
  */
 function getAppDeploymentTransactionNote(metadata) {
-    return `${exports.APP_DEPLOY_NOTE_PREFIX}${JSON.stringify(metadata)}`;
+    return {
+        dAppName: app_2.APP_DEPLOY_NOTE_DAPP,
+        data: metadata,
+        format: 'j',
+    };
 }
 exports.getAppDeploymentTransactionNote = getAppDeploymentTransactionNote;
 /**
  * Replaces deploy-time deployment control parameters within the given teal code.
  *
- * @see {UPDATABLE_TEMPLATE_NAME}
- * @see {DELETABLE_TEMPLATE_NAME}
+ * * `TMPL_UPDATABLE` for updatability / immutability control
+ * * `TMPL_DELETABLE` for deletability / permanence control
+ *
+ * Note: If these values are not undefined, but the corresponding `TMPL_*` value
+ *  isn't in the teal code it will throw an exception.
  *
  * @param tealCode The TEAL code to substitute
  * @param params The deploy-time deployment control parameter value to replace
  * @returns The replaced TEAL code
  */
 function replaceDeployTimeControlParams(tealCode, params) {
-    return tealCode
-        .replace(exports.UPDATABLE_TEMPLATE_NAME, (params.updatable ? 1 : 0).toString())
-        .replace(exports.DELETABLE_TEMPLATE_NAME, (params.deletable ? 1 : 0).toString());
+    if (params.updatable !== undefined) {
+        if (!tealCode.includes(app_2.UPDATABLE_TEMPLATE_NAME)) {
+            throw new Error(`Deploy-time updatability control requested for app deployment, but ${app_2.UPDATABLE_TEMPLATE_NAME} not present in TEAL code`);
+        }
+        tealCode = tealCode.replace(new RegExp(app_2.UPDATABLE_TEMPLATE_NAME, 'g'), (params.updatable ? 1 : 0).toString());
+    }
+    if (params.deletable !== undefined) {
+        if (!tealCode.includes(app_2.DELETABLE_TEMPLATE_NAME)) {
+            throw new Error(`Deploy-time deletability control requested for app deployment, but ${app_2.DELETABLE_TEMPLATE_NAME} not present in TEAL code`);
+        }
+        tealCode = tealCode.replace(new RegExp(app_2.DELETABLE_TEMPLATE_NAME, 'g'), (params.deletable ? 1 : 0).toString());
+    }
+    return tealCode;
 }
 exports.replaceDeployTimeControlParams = replaceDeployTimeControlParams;
 /**
- * Performs template substitution of a teal file and compiles it, returning the compiled result and optionally caching on the file system.
+ * Performs template substitution of a teal file.
  *
  * Looks for `TMPL_{parameter}` for template replacements.
  *
  * @param tealCode The TEAL logic to compile
- * @param algod An algod client
- * @param templateParameters Any parameters to replace in the .teal file before compiling
- * @param deploymentMetadata The deployment metadata the app will be deployed with
- * @returns The information about the compiled code
+ * @param templateParams Any parameters to replace in the .teal file before compiling
+ * @returns The TEAL code with replacements
  */
-async function performTemplateSubstitutionAndCompile(tealCode, algod, templateParameters, deploymentMetadata) {
-    if (templateParameters !== undefined) {
-        for (const key in templateParameters) {
-            const value = templateParameters[key];
-            const token = `TMPL_${key}`;
-            // todo: handle uint8array
+function performTemplateSubstitution(tealCode, templateParams) {
+    if (templateParams !== undefined) {
+        for (const key in templateParams) {
+            const value = templateParams[key];
+            const token = `TMPL_${key.replace(/^TMPL_/, '')}`;
             tealCode = tealCode.replace(new RegExp(token, 'g'), typeof value === 'string'
                 ? `0x${Buffer.from(value, 'utf-8').toString('hex')}`
                 : ArrayBuffer.isView(value)
@@ -377,16 +404,26 @@ async function performTemplateSubstitutionAndCompile(tealCode, algod, templatePa
                     : value.toString());
         }
     }
+    return tealCode;
+}
+exports.performTemplateSubstitution = performTemplateSubstitution;
+/**
+ * Performs template substitution of a teal file and compiles it, returning the compiled result.
+ *
+ * Looks for `TMPL_{parameter}` for template replacements.
+ *
+ * @param tealCode The TEAL logic to compile
+ * @param algod An algod client
+ * @param templateParams Any parameters to replace in the .teal file before compiling
+ * @param deploymentMetadata The deployment metadata the app will be deployed with
+ * @returns The information about the compiled code
+ */
+async function performTemplateSubstitutionAndCompile(tealCode, algod, templateParams, deploymentMetadata) {
+    tealCode = performTemplateSubstitution(tealCode, templateParams);
     if (deploymentMetadata) {
         tealCode = replaceDeployTimeControlParams(tealCode, deploymentMetadata);
     }
-    const compiled = await algod.compile(tealCode).do();
-    return {
-        teal: tealCode,
-        compiled: compiled.result,
-        compiledHash: compiled.hash,
-        compiledBase64ToBytes: new Uint8Array(Buffer.from(compiled.result, 'base64')),
-    };
+    return await (0, app_1.compileTeal)(tealCode, algod);
 }
 exports.performTemplateSubstitutionAndCompile = performTemplateSubstitutionAndCompile;
-//# sourceMappingURL=deploy-app.js.map
+//# sourceMappingURL=app-deploy.js.map

package/app-deploy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-deploy.js","sourceRoot":"","sources":["../src/app-deploy.ts"],"names":[],"mappings":";;;AAAA,qCAA6G;AAC7G,wBAA0B;AAC1B,+BAA8E;AAC9E,qDAA+F;AAC/F,+CAA+E;AAE/E,qCAcoB;AAGpB;;;;;;;;;;;;;;GAcG;AACI,KAAK,UAAU,SAAS,CAC7B,UAA+B,EAC/B,KAAc,EACd,OAAiB;IAejB,MAAM,EACJ,QAAQ,EACR,gBAAgB,EAAE,oBAAoB,EACtC,aAAa,EACb,QAAQ,EACR,mBAAmB,EACnB,UAAU,EACV,UAAU,EACV,UAAU,EACV,GAAG,SAAS,EACb,GAAG,UAAU,CAAA;IAEd,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,OAAO,KAAK,IAAA,8BAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,EAAE;QAC3F,MAAM,IAAI,KAAK,CACb,0DAA0D,mBAAmB,CAAC,OAAO,0CAA0C,SAAS,CAAC,IAAI,EAAE,CAChJ,CAAA;KACF;IACD,IAAI,CAAC,mBAAmB,IAAI,CAAC,OAAO,EAAE;QACpC,MAAM,IAAI,KAAK,CAAC,uHAAuH,CAAC,CAAA;KACzI;IAED,SAAM,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAC1C,+BAA+B,QAAQ,CAAC,IAAI,kBAAkB,IAAA,8BAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,UAC5F,SAAS,CAAC,eAAe,CAAC,MAC5B,2BAA2B,SAAS,CAAC,iBAAiB,CAAC,MAAM,qBAAqB,CACnF,CAAA;IAED,MAAM,gBAAgB,GACpB,OAAO,SAAS,CAAC,eAAe,KAAK,QAAQ;QAC3C,CAAC,CAAC,MAAM,qCAAqC,CAAC,SAAS,CAAC,eAAe,EAAE,KAAK,EAAE,oBAAoB,EAAE,QAAQ,CAAC;QAC/G,CAAC,CAAC,SAAS,CAAA;IACf,SAAS,CAAC,eAAe,GAAG,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC,CAAC,SAAS,CAAC,eAAe,CAAA;IAEjH,MAAM,aAAa,GACjB,OAAO,SAAS,CAAC,iBAAiB,KAAK,QAAQ;QAC7C,CAAC,CAAC,MAAM,qCAAqC,CAAC,SAAS,CAAC,iBAAiB,EAAE,KAAK,EAAE,oBAAoB,CAAC;QACvG,CAAC,CAAC,SAAS,CAAA;IAEf,SAAS,CAAC,iBAAiB,GAAG,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAA;IAE/G,oEAAoE;IACpE,MAAM,IAAI,GAAG,mBAAmB,IAAI,CAAC,MAAM,oBAAoB,CAAC,SAAS,CAAC,IAAI,EAAE,OAAQ,CAAC,CAAC,CAAA;IAE1F,MAAM,MAAM,GAAG,KAAK,EAClB,GAA+B,EAG/B,EAAE;QACF,MAAM,MAAM,GAAG,MAAM,IAAA,eAAS,EAC5B;YACE,GAAG,SAAS;YACZ,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,+BAA+B,CAAC,QAAQ,CAAC;YAC/C,GAAG;YACH,WAAW,EAAE,KAAK;SACnB,EACD,KAAK,CACN,CAAA;QAED,OAAO;YACL,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,oEAAoE;YACpE,YAAY,EAAE,MAAM,CAAC,YAAa;YAClC,oEAAoE;YACpE,aAAa,EAAE,MAAM,CAAC,aAAc;YACpC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,eAAe,EAAE,QAAQ;YACzB,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,iBAAiB,CAAC,CAAC;YAC9D,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,iBAAiB,CAAC,CAAC;YAC9D,GAAG,QAAQ;YACX,OAAO,EAAE,KAAK;YACd,kBAAkB,EAAE,QAAQ;YAC5B,gBAAgB;YAChB,aAAa;SACd,CAAA;IACH,CAAC,CAAA;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IAE5C,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,OAAO,EAAE;QACvC,SAAM,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAC1C,OAAO,QAAQ,CAAC,IAAI,iCAAiC,IAAA,8BAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,gCACnF,QAAQ,CAAC,OACX,GAAG,CACJ,CAAA;QAED,OAAO,MAAM,MAAM,EAAE,CAAA;KACtB;IAED,SAAM,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAC1C,gBAAgB,QAAQ,CAAC,IAAI,qBAAqB,IAAA,8BAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,WAAW,CAAC,KAAK,gBAClH,WAAW,CAAC,OACd,GAAG,CACJ,CAAA;IAED,MAAM,iBAAiB,GAAG,MAAM,IAAA,gBAAU,EAAC,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IACpE,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;IACrE,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAA;IACrE,oEAAoE;IACpE,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,MAAM,CAAC,qBAAqB,CAAE,CAAA;IAC7E,oEAAoE;IACpE,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,MAAM,CAAC,oBAAoB,CAAE,CAAA;IAE3E,MAAM,eAAe,GAA2B;QAC9C,gBAAgB,EAAE,SAAS,CAAC,MAAM,CAAC,gBAAgB;QACnD,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;KACxC,CAAA;IACD,MAAM,cAAc,GAA2B;QAC7C,gBAAgB,EAAE,SAAS,CAAC,MAAM,CAAC,eAAe;QAClD,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS;KACvC,CAAA;IACD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC7E,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAE5E,MAAM,QAAQ,GAAG,WAAW,KAAK,gBAAgB,IAAI,QAAQ,KAAK,aAAa,CAAA;IAC/E,MAAM,aAAa,GAAG,gBAAgB,CAAC,oBAAoB,EAAE,eAAe,CAAC,IAAI,gBAAgB,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAA;IAEtI,MAAM,OAAO,GAAG,KAAK,IASnB,EAAE;QACF,MAAM,GAAG,GAAG,IAAI,mCAAyB,EAAE,CAAA;QAE3C,SAAS;QAET,SAAM,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAC1C,mBAAmB,QAAQ,CAAC,IAAI,YAAY,IAAA,8BAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,gCAAgC,QAAQ,CAAC,OAAO,GAAG,CAChI,CAAA;QAED,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,CAAA;QAC5D,MAAM,kBAAkB,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,CAAA;QAEnD,SAAS;QAET,SAAM,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAC1C,qBAAqB,QAAQ,CAAC,IAAI,gBAAgB,WAAW,CAAC,KAAK,SAAS,IAAA,8BAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CACxH,CAAA;QAED,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,aAAO,EACtD;YACE,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,QAAQ,EAAE,QAAQ;YAClB,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,IAAI,EAAE,UAAU;YAChB,iBAAiB,EAAE,SAAS,CAAC,iBAAiB;YAC9C,WAAW,EAAE,SAAS,CAAC,WAAW;YAClC,WAAW,EAAE,IAAI;YACjB,GAAG;SACJ,EACD,KAAK,CACN,CAAA;QAED,6CAA6C;QAC7C,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,2CAA6B,EAClF;YACE,GAAG;YACH,UAAU,EAAE;gBACV,8BAA8B,EAAE,SAAS,CAAC,8BAA8B;gBACxE,WAAW,EAAE,KAAK;gBAClB,WAAW,EAAE,IAAI;aAClB;SACF,EACD,KAAK,CACN,CAAA;QAED,oEAAoE;QACpE,MAAM,kBAAkB,GAAG,aAAc,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACxE,oEAAoE;QACpE,MAAM,kBAAkB,GAAG,aAAc,CAAC,aAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACpE,oEAAoE;QACpE,MAAM,WAAW,GAAG,kBAAkB,CAAC,mBAAmB,CAAE,CAAA;QAE5D,SAAM,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAC1C,qBAAqB,iBAAiB,CAAC,IAAI,EAAE,0BAA0B,WAAW,QAAQ,iBAAiB,CAAC,IAAI,EAAE,0BAChH,WAAW,CAAC,KACd,SAAS,IAAA,8BAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CACrD,CAAA;QAED,OAAO;YACL,WAAW,EAAE,iBAAiB;YAC9B,YAAY,EAAE,YAAY;YAC1B,oEAAoE;YACpE,YAAY,EAAE,kBAAmB;YACjC,oEAAoE;YACpE,aAAa,EAAE,aAAc;YAC7B,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;YACpB,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;YAC1B,KAAK,EAAE,WAAW;YAClB,UAAU,EAAE,IAAA,+BAAqB,EAAC,WAAW,CAAC;YAC9C,eAAe,EAAE,QAAQ;YACzB,YAAY,EAAE,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;YAC3D,YAAY,EAAE,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;YAC3D,GAAG,QAAQ;YACX,OAAO,EAAE,KAAK;YACd,YAAY,EAAE,EAAE,WAAW,EAAE,iBAAiB,EAAE,YAAY,EAAE,kBAAkB,EAAE;YAClF,kBAAkB,EAAE,SAAS;YAC7B,gBAAgB;YAChB,aAAa;SAG4E,CAAA;IAC7F,CAAC,CAAA;IAED,MAAM,MAAM,GAAG,KAAK,IAElB,EAAE;QACF,SAAM,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAC1C,qBAAqB,QAAQ,CAAC,IAAI,YAAY,IAAA,8BAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,eAAe,QAAQ,CAAC,OAAO,GAAG,CACjH,CAAA;QAED,MAAM,MAAM,GAAG,MAAM,IAAA,eAAS,EAC5B;YACE,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,+BAA+B,CAAC,QAAQ,CAAC;YAC/C,eAAe,EAAE,SAAS,CAAC,eAAe;YAC1C,iBAAiB,EAAE,SAAS,CAAC,iBAAiB;YAC9C,iBAAiB,EAAE,SAAS,CAAC,iBAAiB;YAC9C,WAAW,EAAE,SAAS,CAAC,WAAW;YAClC,WAAW,EAAE,KAAK;YAClB,WAAW,EAAE,KAAK;SACnB,EACD,KAAK,CACN,CAAA;QAED,OAAO;YACL,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,oEAAoE;YACpE,YAAY,EAAE,MAAM,CAAC,YAAa;YAClC,oEAAoE;YACpE,aAAa,EAAE,MAAM,CAAC,aAAc;YACpC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,UAAU,EAAE,WAAW,CAAC,UAAU;YAClC,eAAe,EAAE,WAAW,CAAC,eAAe;YAC5C,YAAY,EAAE,WAAW,CAAC,YAAY;YACtC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,iBAAiB,CAAC,CAAC;YAC9D,GAAG,QAAQ;YACX,OAAO,EAAE,KAAK;YACd,kBAAkB,EAAE,QAAQ;YAC5B,gBAAgB;YAChB,aAAa;SACd,CAAA;IACH,CAAC,CAAA;IAED,IAAI,aAAa,EAAE;QACjB,SAAM,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,gDAAgD,WAAW,CAAC,KAAK,GAAG,EAAE;YACjH,IAAI,EAAE;gBACJ,MAAM,EAAE,oBAAoB;gBAC5B,KAAK,EAAE,mBAAmB;aAC3B;YACD,EAAE,EAAE;gBACF,MAAM,EAAE,eAAe;gBACvB,KAAK,EAAE,cAAc;aACtB;SACF,CAAC,CAAA;QAEF,IAAI,aAAa,KAAK,SAAS,IAAI,aAAa,KAAK,MAAM,IAAI,aAAa,KAAK,mBAAa,CAAC,IAAI,EAAE;YACnG,MAAM,IAAI,KAAK,CACb,mFAAmF;gBACjF,0DAA0D;gBAC1D,oDAAoD,CACvD,CAAA;SACF;QAED,IAAI,WAAW,CAAC,SAAS,EAAE;YACzB,SAAM,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAC1C,kGAAkG,CACnG,CAAA;SACF;aAAM;YACL,SAAM,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAC1C,6GAA6G,CAC9G,CAAA;SACF;QAED,OAAO,MAAM,OAAO,EAAE,CAAA;KACvB;IAED,IAAI,QAAQ,EAAE;QACZ,SAAM,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAC1C,iCAAiC,WAAW,CAAC,KAAK,gBAAgB,IAAA,8BAAgB,EAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CACrG,CAAA;QAED,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,cAAQ,CAAC,IAAI,EAAE;YAC/E,MAAM,IAAI,KAAK,CACb,0DAA0D;gBACxD,0DAA0D;gBAC1D,gCAAgC,CACnC,CAAA;SACF;QAED,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,cAAQ,CAAC,SAAS,EAAE;YAC5D,IAAI,WAAW,CAAC,SAAS,EAAE;gBACzB,SAAM,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAA;aACzG;iBAAM;gBACL,SAAM,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAC1C,uGAAuG,CACxG,CAAA;aACF;YAED,OAAO,MAAM,MAAM,EAAE,CAAA;SACtB;QAED,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,cAAQ,CAAC,UAAU,EAAE;YAC9D,IAAI,WAAW,CAAC,SAAS,EAAE;gBACzB,SAAM,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,oFAAoF,CAAC,CAAA;aACnI;iBAAM;gBACL,SAAM,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAC1C,+HAA+H,CAChI,CAAA;aACF;YAED,OAAO,MAAM,OAAO,EAAE,CAAA;SACvB;KACF;IAED,SAAM,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAA;IAE3F,OAAO,EAAE,GAAG,WAAW,EAAE,kBAAkB,EAAE,SAAS,EAAE,gBAAgB,EAAE,aAAa,EAAE,CAAA;AAC3F,CAAC;AA5VD,8BA4VC;AAED;;;;;;;GAOG;AACH,SAAgB,gBAAgB,CAAC,MAA8B,EAAE,KAA6B;IAC5F,OAAO,MAAM,CAAC,gBAAgB,CAAC,GAAG,KAAK,CAAC,gBAAgB,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAA;AACrG,CAAC;AAFD,4CAEC;AAED;;;;;;;;GAQG;AACI,KAAK,UAAU,oBAAoB,CAAC,cAA4C,EAAE,OAAgB;IACvG,MAAM,SAAS,GAAgC,EAAE,CAAA;IAEjD,MAAM,cAAc,GAAG,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,8BAAgB,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAA;IAE7G,wCAAwC;IACxC,MAAM,WAAW,GAAG,CAAC,MAAM,IAAA,yDAAwC,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;SAC1F,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,oEAAoE;QACpE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC,kBAAkB,CAAE,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAA;IACjF,CAAC,CAAC;SACD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,GAAG,CAAC,CAAC,cAAc,CAAC,CAAA;IAEtD,qDAAqD;IACrD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAC5B,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QACnC,2HAA2H;QAC3H,MAAM,eAAe,GAAG,MAAM,IAAA,mCAAkB,EAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAC9D,CAAC;aACE,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC;aACnC,MAAM,CAAC,yBAAe,CAAC,IAAI,CAAC;aAC5B,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;aAC5B,OAAO,CAAC,cAAc,CAAC;aACvB,WAAW,CAAC,QAAQ,CAAC;aACrB,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,0BAAoB,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CACpE,CAAA;QAED,2EAA2E;QAC3E,uDAAuD;QACvD,iEAAiE;QACjE,MAAM,sBAAsB,GAAG,eAAe,CAAC,YAAY,CAAC,MAAM;QAChE,oEAAoE;QACpE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,yBAAyB,CAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,cAAc,CAC5F,CAAC,CAAC,CAAC,CAAA;QAEJ,MAAM,0BAA0B,GAAG,eAAe,CAAC,YAAY;aAC5D,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,cAAc,CAAC;aAC1C,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACb,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC;YAC3C,CAAC,CAAC,oEAAoE;gBACpE,CAAC,CAAC,CAAC,oBAAoB,CAAE,GAAG,CAAC,CAAC,oBAAoB,CAAE,CAAC,GAAG,EAAE;YAC5D,CAAC,CAAC,oEAAoE;gBACpE,CAAC,CAAC,iBAAiB,CAAE,GAAG,CAAC,CAAC,iBAAiB,CAAE,CAClD,CAAC,CAAC,CAAC,CAAA;QAEN,IAAI,CAAC,sBAAsB,EAAE,IAAI;YAC/B,oBAAoB;YACpB,OAAO,IAAI,CAAA;QAEb,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,CAAA;IAC3E,CAAC,CAAC,CACH,CAAA;IAED,IAAI;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;SACzB,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACb,oEAAoE;QACpE,MAAM,EAAE,UAAU,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,GAAG,CAAE,CAAA;QAE7E,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE;YAClC,IAAI,CAAC,IAAI,EAAE;gBACT,uBAAuB;gBACvB,OAAM;aACP;YAED,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAA;YACjC,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YACtD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;YAE1E,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,0BAAoB,KAAK,CAAC;gBACxD,2CAA2C;gBAC3C,OAAM;YAER,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,0BAAoB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAsB,CAAA;QACjG,CAAC,CAAA;QAED,IAAI;YACF,MAAM,YAAY,GAAG,SAAS,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAA;YAC3D,MAAM,UAAU,GAAG,SAAS,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAA;YAC7D,IAAI,YAAY,EAAE,IAAI,EAAE;gBACtB,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG;oBAC7B,KAAK,EAAE,UAAU,CAAC,EAAE;oBACpB,UAAU,EAAE,IAAA,+BAAqB,EAAC,UAAU,CAAC,EAAE,CAAC;oBAChD,eAAe,EAAE,YAAY;oBAC7B,YAAY,EAAE,MAAM,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;oBAC/D,GAAG,CAAC,UAAU,IAAI,YAAY,CAAC;oBAC/B,YAAY,EAAE,MAAM,CAAC,0BAA0B,EAAE,CAAC,iBAAiB,CAAC,CAAC;oBACrE,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,KAAK;iBACrC,CAAA;aACF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,SAAM,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,UAAU,CAAC,EAAE,gBAAgB,cAAc,oBAAoB,EAAE,CAAC,CAAC,CAAA;YACpI,OAAM;SACP;IACH,CAAC,CAAC,CAAA;IAEJ,OAAO;QACL,OAAO,EAAE,cAAc;QACvB,IAAI,EAAE,SAAS;KAChB,CAAA;AACH,CAAC;AApGD,oDAoGC;AAED;;;;GAIG;AACH,SAAgB,+BAA+B,CAAC,QAA2B;IACzE,OAAO;QACL,QAAQ,EAAE,0BAAoB;QAC9B,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,GAAG;KACZ,CAAA;AACH,CAAC;AAND,0EAMC;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,8BAA8B,CAAC,QAAgB,EAAE,MAAoD;IACnH,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE;QAClC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,6BAAuB,CAAC,EAAE;YAC/C,MAAM,IAAI,KAAK,CACb,sEAAsE,6BAAuB,2BAA2B,CACzH,CAAA;SACF;QACD,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,6BAAuB,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;KAC7G;IAED,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE;QAClC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,6BAAuB,CAAC,EAAE;YAC/C,MAAM,IAAI,KAAK,CACb,sEAAsE,6BAAuB,2BAA2B,CACzH,CAAA;SACF;QACD,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,6BAAuB,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;KAC7G;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC;AApBD,wEAoBC;AAED;;;;;;;;GAQG;AACH,SAAgB,2BAA2B,CAAC,QAAgB,EAAE,cAAmC;IAC/F,IAAI,cAAc,KAAK,SAAS,EAAE;QAChC,KAAK,MAAM,GAAG,IAAI,cAAc,EAAE;YAChC,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,CAAA;YACjC,MAAM,KAAK,GAAG,QAAQ,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAA;YACjD,QAAQ,GAAG,QAAQ,CAAC,OAAO,CACzB,IAAI,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EACtB,OAAO,KAAK,KAAK,QAAQ;gBACvB,CAAC,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACpD,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;oBAC3B,CAAC,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;oBAC3C,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CACrB,CAAA;SACF;KACF;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC;AAjBD,kEAiBC;AAED;;;;;;;;;;GAUG;AACI,KAAK,UAAU,qCAAqC,CACzD,QAAgB,EAChB,KAAc,EACd,cAAmC,EACnC,kBAAsC;IAEtC,QAAQ,GAAG,2BAA2B,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;IAEhE,IAAI,kBAAkB,EAAE;QACtB,QAAQ,GAAG,8BAA8B,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAA;KACxE;IAED,OAAO,MAAM,IAAA,iBAAW,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC3C,CAAC;AAbD,sFAaC"}