Standardize json reading

Author: JoviDeCroock

packages/app/src/cli/models/extensions/specifications/type-generation.ts

@@ -239,6 +239,20 @@ interface GeneratedIntentResponseFallback<GeneratedResponse> {
   response?: NonNullable<GeneratedResponse>;
 }
 
+interface GeneratedIntentRequestConstraint<Request> {
+  request: Request;
+}
+
+type ReplaceSubscribableValue<Base, Value> = Base extends {value: unknown; subscribe: (callback: (value: infer _) => void) => () => void}
+  ? Omit<Base, 'value' | 'subscribe'> & {
+      readonly value: Value;
+      subscribe: (callback: (value: Value) => void) => () => void;
+    }
+  : {
+      readonly value: Value;
+      subscribe: (callback: (value: Value) => void) => () => void;
+    };
+
 interface GeneratedIntentsConstraint<Intents> {
   intents?: Intents;
 }
@@ -254,11 +268,19 @@ interface GeneratedIntentsFallback {
 
 type MergeGeneratedIntentResponse<Intents> =
   ShopifyGeneratedIntentVariants extends infer Generated
-    ? Generated extends GeneratedIntentResponseConstraint<infer GeneratedResponse>
-      ? Omit<Generated, 'response'> &
-          (Intents extends GeneratedIntentResponseConstraint<infer BaseResponse>
+    ? Generated extends GeneratedIntentRequestConstraint<infer GeneratedRequest>
+      ? Omit<Generated, 'request' | 'response'> & {
+          request: Intents extends GeneratedIntentRequestConstraint<infer BaseRequest>
+            ? ReplaceSubscribableValue<BaseRequest, GeneratedRequest | null>
+            : {
+                readonly value: GeneratedRequest | null;
+                subscribe: (callback: (value: GeneratedRequest | null) => void) => () => void;
+              };
+        } & (Generated extends GeneratedIntentResponseConstraint<infer GeneratedResponse>
+          ? Intents extends GeneratedIntentResponseConstraint<infer BaseResponse>
             ? GeneratedIntentResponseOverride<BaseResponse, GeneratedResponse>
-            : GeneratedIntentResponseFallback<GeneratedResponse>)
+            : GeneratedIntentResponseFallback<GeneratedResponse>
+          : unknown)
       : Generated
     : never;`)
 

packages/app/src/cli/models/extensions/specifications/ui_extension.ts

@@ -286,21 +286,11 @@ const uiExtensionSpec = createExtensionSpecification({
         let toolsTypeDefinition = ''
         if (toolsDefinition) {
           try {
-            const toolsFilePath = joinPath(extension.directory, toolsDefinition)
-            if (await fileExists(toolsFilePath)) {
-              // Read and parse the tools JSON file
-              const toolsContent = await readFile(toolsFilePath)
-              const tools = ToolsFileSchema.safeParse(JSON.parse(toolsContent))
-              if (tools.success) {
-                // Generate tools type definition
-                toolsTypeDefinition = await createToolsTypeDefinition(tools.data)
-              } else {
-                outputWarn(
-                  `Invalid tools definition in "${toolsDefinition}": ${tools.error.issues
-                    .map((issue) => issue.message)
-                    .join(', ')}`,
-                )
-              }
+            const tools = await readAndValidateJsonAsset(extension.directory, toolsDefinition, ToolsFileSchema)
+            if (tools.status === 'ok') {
+              toolsTypeDefinition = await createToolsTypeDefinition(tools.data)
+            } else if (tools.status === 'invalid') {
+              outputWarn(`Invalid tools definition in "${toolsDefinition}": ${tools.issues}`)
             }
             // eslint-disable-next-line no-catch-all/no-catch-all
           } catch (error) {
@@ -382,26 +372,41 @@ function addDistPathToAssets(extP: NewExtensionPointSchemaType & {build_manifest
   }
 }
 
+type JsonAssetResult<T> = {status: 'ok'; data: T} | {status: 'missing'} | {status: 'invalid'; issues: string}
+
+async function readAndValidateJsonAsset<T>(
+  extensionDirectory: string,
+  relativePath: string,
+  schema: zod.ZodType<T>,
+): Promise<JsonAssetResult<T>> {
+  const filePath = joinPath(extensionDirectory, relativePath)
+  const exists = await fileExists(filePath)
+  if (!exists) return {status: 'missing'}
+
+  const content = await readFile(filePath)
+  const parsed = schema.safeParse(JSON.parse(content))
+  if (!parsed.success) {
+    return {
+      status: 'invalid',
+      issues: parsed.error.issues.map((issue) => issue.message).join(', '),
+    }
+  }
+
+  return {status: 'ok', data: parsed.data}
+}
+
 async function parseIntentTypeDefinitions(
   extensionDirectory: string,
   intents: NonNullable<NewExtensionPointSchemaType['intents']>,
 ): Promise<GeneratedIntentTypeDefinition[]> {
   const parsedIntentDefinitions = await Promise.all(
     intents.map(async (intent) => {
       try {
-        const intentSchemaFilePath = joinPath(extensionDirectory, intent.schema)
-        const schemaExists = await fileExists(intentSchemaFilePath)
-        if (!schemaExists) return null
-
-        const intentSchemaContent = await readFile(intentSchemaFilePath)
-        const intentSchema = IntentSchemaFileSchema.safeParse(JSON.parse(intentSchemaContent))
-
-        if (!intentSchema.success) {
-          outputWarn(
-            `Invalid intent schema in "${intent.schema}": ${intentSchema.error.issues
-              .map((issue) => issue.message)
-              .join(', ')}`,
-          )
+        const intentSchema = await readAndValidateJsonAsset(extensionDirectory, intent.schema, IntentSchemaFileSchema)
+        if (intentSchema.status === 'missing') return null
+
+        if (intentSchema.status === 'invalid') {
+          outputWarn(`Invalid intent schema in "${intent.schema}": ${intentSchema.issues}`)
           return null
         }