@wirechunk/cli 0.0.2 → 0.0.3

package/build/main.js

@@ -3955,15 +3955,14 @@ const normalizeEmailAddress = (email) => {
   }
   return { ok: true, value: emailTrimmed };
 };
-const defaultFormattedDataTemplate = `{{#each .}}{{@key}}: {{{.}}}
-{{/each}}`;
 const siteDomainKey = "siteDomain";
-const formattedDataKey = "formattedData";
 const submittedAtKey = "submittedAt";
+const defaultFormattedDataTemplate = `{{#each .}}{{@key}}: {{{.}}}
+{{/each}}`;
 const defaultNotificationEmailBodyTemplate = `Form entry from your site {{${siteDomainKey}}}:
 
-{{{${formattedDataKey}}}}
-
+{{#each .}}{{@key}}: {{{.}}}
+{{/each}}
 
 Submitted {{${submittedAtKey}}}
 `;
@@ -24972,7 +24971,7 @@ const bootstrap = async (opts, env2) => {
   });
   console.log(`Created platform ${name} with handle ${handle} (ID ${platformId})`);
 };
-const validateExtensionConfig$1 = validate25;
+const validateExtensionConfig = validate25;
 function validate25(data, { instancePath = "", parentData, parentDataProperty, rootData = data, dynamicAnchors = {} } = {}) {
   let vErrors = null;
   let errors2 = 0;
@@ -32035,7 +32034,7 @@ const preCompiledSafeValidator = (validate2) => (value) => {
     error: errorsText(validate2)
   };
 };
-const validateExtensionConfig = preCompiledSafeValidator(validateExtensionConfig$1);
+const validateExtensionManifest = preCompiledSafeValidator(validateExtensionConfig);
 const requireValidExtensionDir = async (dir2) => {
   const extConfigPath = resolve$1(dir2, "extension.json");
   if (!existsSync(extConfigPath)) {
@@ -32043,7 +32042,7 @@ const requireValidExtensionDir = async (dir2) => {
     process.exit(1);
   }
   const extConfig = JSON.parse(await readFile(extConfigPath, "utf8"));
-  const validateResult = validateExtensionConfig(extConfig);
+  const validateResult = validateExtensionManifest(extConfig);
   if (validateResult.ok) {
     const config2 = validateResult.value;
     if (config2.components) {
@@ -32059,7 +32058,7 @@ const requireValidExtensionDir = async (dir2) => {
         }
       }
     }
-    return { ...config2, dir: dir2 };
+    return { manifest: config2, dir: dir2 };
   }
   console.error(`Invalid extension config file:`, validateResult.error);
   process.exit(1);
@@ -60711,20 +60710,20 @@ const createExtensionVersion = async (opts, env2) => {
   const extensionId = requireExtensionIdOptionOrEnvVar(opts, env2);
   const apiToken = requireApiToken(env2);
   const cwd = process.cwd();
-  const extConfig = await requireValidExtensionDir(cwd);
+  const { manifest } = await requireValidExtensionDir(cwd);
   let enableServer;
   let enableDb;
-  if (extConfig.server) {
-    enableServer = !!extConfig.server.enable;
-    if (extConfig.server.database?.enable && extConfig.server.enable === false) {
+  if (manifest.server) {
+    enableServer = !!manifest.server.enable;
+    if (manifest.server.database?.enable && manifest.server.enable === false) {
       console.warn("WARNING: Automatically disabling database because server is disabled");
       enableDb = false;
-    } else if (extConfig.server.database?.enable && !extConfig.server.enable) {
+    } else if (manifest.server.database?.enable && !manifest.server.enable) {
       console.warn("WARNING: Automatically enabling server because database is enabled");
       enableServer = true;
       enableDb = true;
     } else {
-      enableDb = !!extConfig.server.database?.enable;
+      enableDb = !!manifest.server.database?.enable;
     }
   } else {
     enableServer = false;
@@ -60748,7 +60747,7 @@ const createExtensionVersion = async (opts, env2) => {
   console.log(`Creating extension version ${versionName} (Extension ID ${extensionId})
   Server: ${enableServer ? "enabled" : "disabled"}
   Database: ${enableDb ? "enabled" : "disabled"}
-  Components: ${Object.keys(extConfig.components ?? {}).length}`);
+  Components: ${Object.keys(manifest.components ?? {}).length}`);
   let extensionVersionId;
   let signedUrl;
   try {
@@ -60761,8 +60760,9 @@ const createExtensionVersion = async (opts, env2) => {
       variables: {
         input: {
           extensionId,
-          extensionName: extConfig.name,
+          extensionName: manifest.name,
           versionName,
+          manifest: JSON.stringify(manifest),
           enableServer,
           enableDb,
           config: config2 ? JSON.stringify(config2) : void 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wirechunk/cli",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "private": false,
   "type": "module",
   "scripts": {

package/src/commands/create-extension-version.ts

@@ -44,22 +44,22 @@ export const createExtensionVersion = async (
   const extensionId = requireExtensionIdOptionOrEnvVar(opts, env);
   const apiToken = requireApiToken(env);
   const cwd = process.cwd();
-  const extConfig = await requireValidExtensionDir(cwd);
+  const { manifest } = await requireValidExtensionDir(cwd);
   let enableServer: boolean;
   let enableDb: boolean;
-  if (extConfig.server) {
-    enableServer = !!extConfig.server.enable;
-    if (extConfig.server.database?.enable && extConfig.server.enable === false) {
+  if (manifest.server) {
+    enableServer = !!manifest.server.enable;
+    if (manifest.server.database?.enable && manifest.server.enable === false) {
       // Server was explicitly disabled, so don't allow database.
       console.warn('WARNING: Automatically disabling database because server is disabled');
       enableDb = false;
-    } else if (extConfig.server.database?.enable && !extConfig.server.enable) {
+    } else if (manifest.server.database?.enable && !manifest.server.enable) {
       // Server was unspecified, so enable it because database is enabled.
       console.warn('WARNING: Automatically enabling server because database is enabled');
       enableServer = true;
       enableDb = true;
     } else {
-      enableDb = !!extConfig.server.database?.enable;
+      enableDb = !!manifest.server.database?.enable;
     }
   } else {
     enableServer = false;
@@ -84,7 +84,7 @@ export const createExtensionVersion = async (
   console.log(`Creating extension version ${versionName} (Extension ID ${extensionId})
   Server: ${enableServer ? 'enabled' : 'disabled'}
   Database: ${enableDb ? 'enabled' : 'disabled'}
-  Components: ${Object.keys(extConfig.components ?? {}).length}`);
+  Components: ${Object.keys(manifest.components ?? {}).length}`);
 
   let extensionVersionId: string;
   let signedUrl: string;
@@ -98,8 +98,9 @@ export const createExtensionVersion = async (
       variables: {
         input: {
           extensionId,
-          extensionName: extConfig.name,
+          extensionName: manifest.name,
           versionName,
+          manifest: JSON.stringify(manifest),
           enableServer,
           enableDb,
           config: config ? JSON.stringify(config) : undefined,

package/src/core-api/api.ts

@@ -364,6 +364,8 @@ export type CreateExtensionVersionInput = {
   extensionId: Scalars['String']['input'];
   /** The extension name is required only so that we can validate that a user is not mistakenly trying to change the name. */
   extensionName: Scalars['String']['input'];
+  /** A JSON object. */
+  manifest: Scalars['String']['input'];
   versionName: Scalars['String']['input'];
 };
 
@@ -961,6 +963,27 @@ export type EditFormTemplateFormattedDataTemplateSuccessResult = {
   formTemplate: FormTemplate;
 };
 
+export type EditFormTemplateInput = {
+  components?: InputMaybe<ComponentsUpdate>;
+  emailBodyTemplate?: InputMaybe<OptionalStringUpdate>;
+  emailSubjectTemplate?: InputMaybe<OptionalStringUpdate>;
+  id: Scalars['String']['input'];
+  status?: InputMaybe<PublishStatusUpdate>;
+  title?: InputMaybe<StringUpdate>;
+  useEmailBodyTemplate?: InputMaybe<BooleanUpdate>;
+  useEmailSubjectTemplate?: InputMaybe<BooleanUpdate>;
+};
+
+export type EditFormTemplateResult =
+  | AuthorizationError
+  | EditFormTemplateSuccessResult
+  | GenericUserError;
+
+export type EditFormTemplateSuccessResult = {
+  __typename?: 'EditFormTemplateSuccessResult';
+  formTemplate: FormTemplate;
+};
+
 export type EditLayoutInput = {
   components?: InputMaybe<ComponentsUpdate>;
   id: Scalars['String']['input'];
@@ -1320,6 +1343,7 @@ export type Form = {
   confirmationRedirectParameters: Array<FormConfirmationRedirectUrlParameter>;
   confirmationRedirectUrl?: Maybe<Scalars['String']['output']>;
   emailBodyTemplate?: Maybe<Scalars['String']['output']>;
+  emailSubjectTemplate?: Maybe<Scalars['String']['output']>;
   entriesTotalCount: Scalars['Int']['output'];
   formattedDataTemplate?: Maybe<Scalars['String']['output']>;
   id: Scalars['String']['output'];
@@ -1327,6 +1351,7 @@ export type Form = {
   submissionActions: Array<FormSubmissionAction>;
   title: Scalars['String']['output'];
   useEmailBodyTemplate: Scalars['Boolean']['output'];
+  useEmailSubjectTemplate: Scalars['Boolean']['output'];
   useFormattedDataTemplate: Scalars['Boolean']['output'];
 };
 
@@ -1398,12 +1423,14 @@ export type FormTemplate = {
   confirmationRedirectParameters: Array<FormConfirmationRedirectUrlParameter>;
   confirmationRedirectUrl?: Maybe<Scalars['String']['output']>;
   emailBodyTemplate?: Maybe<Scalars['String']['output']>;
+  emailSubjectTemplate?: Maybe<Scalars['String']['output']>;
   formattedDataTemplate?: Maybe<Scalars['String']['output']>;
   id: Scalars['String']['output'];
   status: PublishStatus;
   steps: Array<FormTemplateStep>;
   title: Scalars['String']['output'];
   useEmailBodyTemplate: Scalars['Boolean']['output'];
+  useEmailSubjectTemplate: Scalars['Boolean']['output'];
   useFormattedDataTemplate: Scalars['Boolean']['output'];
 };
 
@@ -1769,6 +1796,7 @@ export type Mutation = {
   editFormStepPosition: EditFormStepPositionResult;
   editFormSubmissionAction: FormSubmissionAction;
   editFormTemplate: FormTemplate;
+  editFormTemplate2: EditFormTemplateResult;
   editFormTemplateConfirmation: FormTemplate;
   editFormTemplateEmailTemplate: EditFormTemplateEmailTemplateResult;
   editFormTemplateFormattedDataTemplate: EditFormTemplateFormattedDataTemplateResult;
@@ -2207,6 +2235,10 @@ export type MutationEditFormTemplateArgs = {
   title: Scalars['String']['input'];
 };
 
+export type MutationEditFormTemplate2Args = {
+  input: EditFormTemplateInput;
+};
+
 export type MutationEditFormTemplateConfirmationArgs = {
   confirmationAction: ConfirmationAction;
   confirmationMessageComponents?: InputMaybe<Scalars['String']['input']>;