@dittowords/cli 3.10.1 → 4.0.0

package/lib/pull.ts

@@ -2,6 +2,7 @@ import fs from "fs";
 import path from "path";
 
 import ora from "ora";
+import * as Sentry from "@sentry/node";
 
 import { createApiClient } from "./api";
 import config from "./config";
@@ -11,9 +12,25 @@ import { collectAndSaveToken } from "./init/token";
 import sourcesToText from "./utils/sourcesToText";
 import { generateJsDriver } from "./utils/generateJsDriver";
 import { cleanFileName } from "./utils/cleanFileName";
-import { SourceInformation, Token, Project, SupportedFormat } from "./types";
+import {
+  SourceInformation,
+  Token,
+  Project,
+  SupportedFormat,
+  ComponentFolder,
+  ComponentSource,
+  Source,
+} from "./types";
 import { fetchVariants } from "./http/fetchVariants";
-import { kMaxLength } from "buffer";
+import { quit } from "./utils/quit";
+import { AxiosError } from "axios";
+import { fetchComponentFolders } from "./http/fetchComponentFolders";
+
+const ensureEndsWithNewLine = (str: string) =>
+  str + (/[\r\n]$/.test(str) ? "" : "\n");
+
+const writeFile = (path: string, data: string) =>
+  new Promise((r) => fs.writeFile(path, ensureEndsWithNewLine(data), r));
 
 const SUPPORTED_FORMATS: SupportedFormat[] = [
   "flat",
@@ -111,13 +128,21 @@ async function downloadAndSaveVariant(
   const api = createApiClient();
   const params: Record<string, string | null> = { variant: variantApiId };
   if (format) params.format = format;
-  if (status) params.status = status;
   if (richText) params.includeRichText = richText.toString();
 
+  // Root-level status gets set as the default if specified
+  if (status) params.status = status;
+
   const savedMessages = await Promise.all(
-    projects.map(async ({ id, fileName }: Project) => {
-      const { data } = await api.get(`/projects/${id}`, {
-        params,
+    projects.map(async (project) => {
+      const projectParams = { ...params };
+      // If project-level status is specified, overrides root-level status
+      if (project.status) projectParams.status = project.status;
+      if (project.exclude_components)
+        projectParams.exclude_components = String(project.exclude_components);
+
+      const { data } = await api.get(`/projects/${project.id}`, {
+        params: projectParams,
         headers: { Authorization: `token ${token}` },
       });
 
@@ -128,7 +153,7 @@ async function downloadAndSaveVariant(
       const extension = getFormatExtension(format);
 
       const filename = cleanFileName(
-        fileName + ("__" + (variantApiId || "base")) + extension
+        project.fileName + ("__" + (variantApiId || "base")) + extension
       );
       const filepath = path.join(consts.TEXT_DIR, filename);
 
@@ -142,7 +167,7 @@ async function downloadAndSaveVariant(
         return "";
       }
 
-      fs.writeFileSync(filepath, dataString);
+      await writeFile(filepath, dataString);
       return getSavedMessage(filename);
     })
   );
@@ -179,18 +204,26 @@ async function downloadAndSaveBase(
   const api = createApiClient();
   const params = { ...options?.meta };
   if (format) params.format = format;
-  if (status) params.status = status;
   if (richText) params.includeRichText = richText.toString();
 
+  // Root-level status gets set as the default if specified
+  if (status) params.status = status;
+
   const savedMessages = await Promise.all(
-    projects.map(async ({ id, fileName }: Project) => {
-      const { data } = await api.get(`/projects/${id}`, {
-        params,
+    projects.map(async (project) => {
+      const projectParams = { ...params };
+      // If project-level status is specified, overrides root-level status
+      if (project.status) projectParams.status = project.status;
+      if (project.exclude_components)
+        projectParams.exclude_components = String(project.exclude_components);
+
+      const { data } = await api.get(`/projects/${project.id}`, {
+        params: projectParams,
         headers: { Authorization: `token ${token}` },
       });
 
       const extension = getFormatExtension(format);
-      const filename = cleanFileName(`${fileName}__base${extension}`);
+      const filename = cleanFileName(`${project.fileName}__base${extension}`);
       const filepath = path.join(consts.TEXT_DIR, filename);
 
       let dataString = data;
@@ -203,7 +236,7 @@ async function downloadAndSaveBase(
         return "";
       }
 
-      fs.writeFileSync(filepath, dataString);
+      await writeFile(filepath, dataString);
       return getSavedMessage(filename);
     })
   );
@@ -242,7 +275,8 @@ async function downloadAndSave(
     shouldFetchComponentLibrary,
     status,
     richText,
-    componentFolders,
+    componentFolders: specifiedComponentFolders,
+    componentRoot,
   } = source;
 
   const formats = getFormat(formatFromSource);
@@ -251,7 +285,17 @@ async function downloadAndSave(
   const spinner = ora(msg);
   spinner.start();
 
-  const variants = await fetchVariants(source);
+  const [variants, allComponentFoldersResponse] = await Promise.all([
+    fetchVariants(source),
+    fetchComponentFolders(),
+  ]);
+
+  const allComponentFolders = Object.entries(
+    allComponentFoldersResponse
+  ).reduce(
+    (acc, [id, name]) => acc.concat([{ id, name }]),
+    [] as ComponentFolder[]
+  );
 
   try {
     msg += cleanOutputFiles();
@@ -262,6 +306,60 @@ async function downloadAndSave(
 
     const meta = options ? options.meta : {};
 
+    const rootRequest = {
+      id: "__root__",
+      name: "Root",
+      // componentRoot can be a boolean or an object
+      status:
+        typeof source.componentRoot === "object"
+          ? source.componentRoot.status
+          : undefined,
+    };
+
+    let componentFolderRequests: ComponentFolder[] = [];
+
+    // there's a lot of complex logic here, and it's tempting to want to
+    // simplify it. however, it's difficult to get rid of the complexity
+    // without sacrificing specificity and expressiveness.
+    //
+    // if folders specified..
+    if (specifiedComponentFolders) {
+      switch (componentRoot) {
+        // .. and no root specified, you only get components in the specified folders
+        case undefined:
+        case false:
+          componentFolderRequests.push(...specifiedComponentFolders);
+          break;
+        // .. and root specified, you get components in folders and the root
+        default:
+          componentFolderRequests.push(...specifiedComponentFolders);
+          componentFolderRequests.push(rootRequest);
+          break;
+      }
+    }
+    // if no folders specified..
+    else {
+      switch (componentRoot) {
+        // .. and no root specified, you get all components including those in folders
+        case undefined:
+          componentFolderRequests.push(...allComponentFolders);
+          componentFolderRequests.push(rootRequest);
+          break;
+        // .. and root specified as false, you only get components in folders
+        case false:
+          componentFolderRequests.push(...allComponentFolders);
+          break;
+        // .. and root specified as true or config object, you only get components in the root
+        default:
+          componentFolderRequests.push(rootRequest);
+          break;
+      }
+    }
+
+    // this array is populated while fetching from the component library and is used when
+    // generating the index.js driver file
+    const componentSources: ComponentSource[] = [];
+
     async function fetchComponentLibrary(format: SupportedFormat) {
       // Always include a variant with an apiID of undefined to ensure that we
       // fetch the base text for the component library.
@@ -271,41 +369,70 @@ async function downloadAndSave(
       if (options?.meta)
         Object.entries(options.meta).forEach(([k, v]) => params.append(k, v));
       if (format) params.append("format", format);
-      if (status) params.append("status", status);
       if (richText) params.append("includeRichText", richText.toString());
-      if (componentFolders) {
-        componentFolders.forEach(({ id }) => params.append("folder_id[]", id));
-      }
 
-      const messages = await Promise.all(
-        componentVariants.map(async ({ apiID: variantApiId }) => {
-          const p = new URLSearchParams(params);
-          if (variantApiId) p.append("variant", variantApiId);
+      // Root-level status gets set as the default if specified
+      if (status) params.append("status", status);
+
+      const messagePromises: Promise<string>[] = [];
 
-          const { data } = await api.get(`/components`, { params: p });
+      componentVariants.forEach(({ apiID: variantApiId }) => {
+        messagePromises.push(
+          ...componentFolderRequests.map(async (componentFolder) => {
+            const componentFolderParams = new URLSearchParams(params);
 
-          const nameExt = getFormatExtension(format);
-          const nameBase = "ditto-component-library";
-          const namePostfix = `__${variantApiId || "base"}`;
+            if (variantApiId)
+              componentFolderParams.append("variant", variantApiId);
 
-          const fileName = cleanFileName(`${nameBase}${namePostfix}${nameExt}`);
-          const filePath = path.join(consts.TEXT_DIR, fileName);
+            // If folder-level status is specified, overrides root-level status
+            if (componentFolder.status)
+              componentFolderParams.append("status", componentFolder.status);
 
-          let dataString = data;
-          if (nameExt === ".json") {
-            dataString = JSON.stringify(data, null, 2);
-          }
+            const url =
+              componentFolder.id === "__root__"
+                ? "/components?root_only=true"
+                : `/component-folders/${componentFolder.id}/components`;
 
-          const dataIsValid = getFormatDataIsValid[format];
-          if (!dataIsValid(dataString)) {
-            return "";
-          }
+            const { data } = await api.get(url, {
+              params: componentFolderParams,
+            });
 
-          await new Promise((r) => fs.writeFile(filePath, dataString, r));
-          return getSavedMessage(fileName);
-        })
-      );
+            const nameExt = getFormatExtension(format);
+            const nameBase = "components";
+            const nameFolder = `__${componentFolder.name}`;
+            const namePostfix = `__${variantApiId || "base"}`;
+
+            const fileName = cleanFileName(
+              `${nameBase}${nameFolder}${namePostfix}${nameExt}`
+            );
+            const filePath = path.join(consts.TEXT_DIR, fileName);
+
+            let dataString = data;
+            if (nameExt === ".json") {
+              dataString = JSON.stringify(data, null, 2);
+            }
+
+            const dataIsValid = getFormatDataIsValid[format];
+            if (!dataIsValid(dataString)) {
+              return "";
+            }
+
+            await writeFile(filePath, dataString);
+
+            componentSources.push({
+              type: "components",
+              id: "ditto_component_library",
+              name: "ditto_component_library",
+              fileName,
+              variant: variantApiId || "base",
+            });
+
+            return getSavedMessage(fileName);
+          })
+        );
+      });
 
+      const messages = await Promise.all(messagePromises);
       msg += messages.join("");
     }
 
@@ -343,14 +470,7 @@ async function downloadAndSave(
       }
     }
 
-    const sources = [...validProjects];
-    if (shouldFetchComponentLibrary) {
-      sources.push({
-        id: "ditto_component_library",
-        name: "Ditto Component Library",
-        fileName: "ditto-component-library",
-      });
-    }
+    const sources: Source[] = [...validProjects, ...componentSources];
 
     if (formats.some((f) => JSON_FORMATS.includes(f)))
       msg += generateJsDriver(sources);
@@ -402,12 +522,30 @@ export interface PullOptions {
   meta?: Record<string, string>;
 }
 
-export const pull = (options?: PullOptions) => {
+export const pull = async (options?: PullOptions) => {
   const meta = options ? options.meta : {};
   const token = config.getToken(consts.CONFIG_FILE, consts.API_HOST);
   const sourceInformation = config.parseSourceInformation();
 
-  return downloadAndSave(sourceInformation, token, { meta });
+  try {
+    return await downloadAndSave(sourceInformation, token, { meta });
+  } catch (e) {
+    const eventId = Sentry.captureException(e);
+    const eventStr = `\n\nError ID: ${output.info(eventId)}`;
+    if (e instanceof AxiosError) {
+      return quit(
+        output.errorText(
+          "Something went wrong connecting to Ditto servers. Please contact support or try again later."
+        ) + eventStr
+      );
+    }
+
+    return quit(
+      output.errorText(
+        "Something went wrong. Please contact support or try again later."
+      ) + eventStr
+    );
+  }
 };
 
 export default {

package/lib/types.ts

@@ -3,13 +3,22 @@ export interface Project {
   id: string;
   url?: string;
   fileName?: string;
+  status?: string;
+  exclude_components?: boolean;
 }
 
-export type Source = Project;
+export type ComponentSource = ComponentFolder & {
+  type: "components";
+  fileName: string;
+  variant: string;
+};
+
+export type Source = (Project & { type?: undefined }) | ComponentSource;
 
-interface ComponentFolder {
+export interface ComponentFolder {
   id: string;
   name: string;
+  status?: string;
 }
 
 export type SupportedFormat =
@@ -20,12 +29,16 @@ export type SupportedFormat =
   | "ios-stringsdict"
   | "icu";
 
+type ComponentsSourceBool = boolean;
+type ComponentsSourceConfig = {
+  root?: boolean | { status: string };
+  folders?: ComponentFolder[];
+};
+type ComponentsSource = ComponentsSourceBool | ComponentsSourceConfig;
+
 export interface ConfigYAML {
   sources?: {
-    components?: {
-      enabled?: boolean;
-      folders?: ComponentFolder[];
-    };
+    components?: ComponentsSource;
     projects?: Project[];
   };
   format?: SupportedFormat;
@@ -42,13 +55,17 @@ export interface ConfigYAML {
 
 export interface SourceInformation {
   hasSourceData: boolean;
+  hasTopLevelProjectsField: boolean;
+  hasTopLevelComponentsField: boolean;
+  hasComponentLibraryInProjects: boolean;
   validProjects: Project[];
   shouldFetchComponentLibrary: boolean;
   variants: boolean;
   format: string | string[] | undefined;
   status: string | undefined;
   richText: boolean | undefined;
-  componentFolders: ComponentFolder[] | null;
+  componentRoot: boolean | { status: string } | undefined;
+  componentFolders: ComponentFolder[] | undefined;
 }
 
 export type Token = string | undefined;

package/lib/utils/createSentryContext.ts

@@ -0,0 +1,20 @@
+type SentryContext = Record<
+  string,
+  string | number | boolean | null | undefined
+>;
+
+/**
+ * Sentry context only supports properties one layer deep
+ */
+export function createSentryContext(obj: unknown) {
+  if (typeof obj !== "object") return {};
+
+  const ctx: SentryContext = {};
+  for (const key in obj) {
+    const k = key as keyof typeof obj;
+    const r = obj[k];
+    ctx[k] = typeof r === "object" || Array.isArray(r) ? JSON.stringify(r) : r;
+  }
+
+  return ctx;
+}

package/lib/utils/generateJsDriver.ts

@@ -24,10 +24,6 @@ const stringifySourceId = (projectId: string) =>
 
 // TODO: support ESM
 export function generateJsDriver(sources: Source[]) {
-  const fileNames = fs
-    .readdirSync(consts.TEXT_DIR)
-    .filter((fileName) => /\.json$/.test(fileName));
-
   const sourceIdsByName: Record<string, string> = sources.reduce(
     (agg, source) => {
       if (source.fileName) {
@@ -39,7 +35,14 @@ export function generateJsDriver(sources: Source[]) {
     {}
   );
 
-  const data = fileNames.reduce(
+  const projectFileNames = fs
+    .readdirSync(consts.TEXT_DIR)
+    .filter(
+      (fileName) => /\.json$/.test(fileName) && !/^components__/.test(fileName)
+    );
+
+  type DriverFile = Record<string, Record<string, string | object>>;
+  const data: DriverFile = projectFileNames.reduce(
     (obj: Record<string, Record<string, string>>, fileName) => {
       const [sourceId, rest] = fileName.split("__");
       const [variantApiId] = rest.split(".");
@@ -57,9 +60,40 @@ export function generateJsDriver(sources: Source[]) {
     {}
   );
 
+  // Create arrays of stringified "...require()" statements,
+  // each of which corresponds to one of the component files
+  // (which are created on a per-component-folder basis)
+  const componentData: Record<string, string[]> = {};
+  sources
+    .filter((s) => s.type === "components")
+    .forEach((componentSource) => {
+      if (componentSource.type !== "components") return;
+      componentData[componentSource.variant] ??= [];
+      componentData[componentSource.variant].push(
+        `...require('./${componentSource.fileName}')`
+      );
+    });
+  // Convert each array of stringified "...require()" statements
+  // into a unified string, and set it on the final data object
+  // that will be written to the driver file
+  Object.keys(componentData).forEach((key) => {
+    data.ditto_component_library ??= {};
+
+    let str = "{";
+    componentData[key].forEach((k, i) => {
+      str += k;
+      if (i < componentData[key].length - 1) str += ", ";
+    });
+    str += "}";
+    data.ditto_component_library[key] = str;
+  });
+
   let dataString = `module.exports = ${JSON.stringify(data, null, 2)}`
     // remove quotes around require statements
-    .replace(/"require\((.*)\)"/g, "require($1)");
+    .replace(/"require\((.*)\)"/g, "require($1)")
+    // remove quotes around opening & closing curlies
+    .replace(/"\{/g, "{")
+    .replace(/\}"/g, "}");
 
   const filePath = path.resolve(consts.TEXT_DIR, "index.js");
   fs.writeFileSync(filePath, dataString, { encoding: "utf8" });

package/lib/utils/quit.ts

@@ -1,5 +1,4 @@
-export function quit(message: string, exitCode = 2) {
-  console.log(`\n${message}\n`);
+export function quit(message: string | null, exitCode = 2) {
+  if (message) console.log(`\n${message}\n`);
   process.exitCode = exitCode;
-  process.exit();
 }

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@dittowords/cli",
-  "version": "3.10.1",
+  "version": "4.0.0",
   "description": "Command Line Interface for Ditto (dittowords.com).",
   "license": "MIT",
   "main": "bin/index.js",
   "scripts": {
-    "prepublish": "tsc",
+    "prepublishOnly": "ENV=production etsc && sentry-cli sourcemaps inject ./bin && npx sentry-cli sourcemaps upload ./bin --release=\"$(cat package.json | jq -r '.version')\"",
     "prepare": "husky install",
-    "start": "tsc && node bin/ditto.js",
-    "sync": "tsc && node bin/ditto.js pull",
-    "dev": "tsc --watch"
+    "start": "etsc && node bin/ditto.js",
+    "sync": "etsc && node bin/ditto.js pull",
+    "dev": "etsc --watch"
   },
   "repository": {
     "type": "git",
@@ -19,7 +19,6 @@
     "url": "https://github.com/dittowords/cli/issues"
   },
   "author": "Ditto Tech Inc.",
-  "license": "MIT",
   "keywords": [
     "ditto",
     "dittowords",
@@ -36,11 +35,15 @@
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-typescript": "^7.18.6",
+    "@sentry/cli": "^2.20.5",
     "@tsconfig/node16": "^1.0.3",
     "@types/jest": "^26.0.9",
     "@types/js-yaml": "^4.0.5",
     "@types/node": "^18.0.0",
     "babel-jest": "^29.3.1",
+    "dotenv": "^16.3.1",
+    "esbuild": "^0.19.2",
+    "esbuild-node-tsc": "^2.0.5",
     "husky": "^7.0.4",
     "jest": "^29.3.1",
     "lint-staged": "^11.2.4",
@@ -55,6 +58,7 @@
     "@babel/parser": "^7.21.4",
     "@babel/traverse": "^7.21.4",
     "@babel/types": "^7.21.4",
+    "@sentry/node": "^7.64.0",
     "@types/babel-traverse": "^6.25.7",
     "@types/fs-extra": "^11.0.1",
     "axios": "^0.27.2",

package/tsconfig.json

@@ -7,7 +7,10 @@
     "resolveJsonModule": true,
     "strictNullChecks": true,
     "sourceMap": true,
+    // Set `sourceRoot` to  "/" to strip the build path prefix from
+    // generated source code references. This will improve issue grouping in Sentry.
+    "sourceRoot": "/",
     "strict": true
   },
-  "include": ["lib/ditto.ts"]
+  "include": ["lib/**/*.ts"]
 }

package/bin/lib/add-project.js

@@ -1,36 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const project_1 = require("./init/project");
-const projectsToText_1 = __importDefault(require("./utils/projectsToText"));
-const getSelectedProjects_1 = require("./utils/getSelectedProjects");
-const output_1 = __importDefault(require("./output"));
-const quit_1 = require("./utils/quit");
-const addProject = async () => {
-    const projects = (0, getSelectedProjects_1.getSelectedProjects)();
-    const usingComponents = (0, getSelectedProjects_1.getIsUsingComponents)();
-    try {
-        if (usingComponents) {
-            if (projects.length) {
-                console.log(`\nYou're currently syncing text from the ${output_1.default.info("Component Library")} and from the following projects: ${(0, projectsToText_1.default)(projects)}`);
-            }
-            else {
-                console.log(`\nYou're currently only syncing text from the ${output_1.default.info("Component Library")}`);
-            }
-        }
-        else if (projects.length) {
-            console.log(`\nYou're currently set up to sync text from the following projects: ${(0, projectsToText_1.default)(projects)}`);
-        }
-        await (0, project_1.collectAndSaveSource)({
-            components: false,
-        });
-    }
-    catch (error) {
-        console.log(`\nSorry, there was an error adding a project to your workspace: `, error);
-        (0, quit_1.quit)("Project selection was not updated.");
-    }
-};
-exports.default = addProject;
-//# sourceMappingURL=add-project.js.map

package/bin/lib/add-project.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../lib/add-project.ts"],"names":[],"mappings":";;;;;AAAA,4CAAsD;AACtD,4EAAoD;AACpD,qEAGqC;AACrC,sDAA8B;AAC9B,uCAAoC;AAEpC,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;IAC5B,MAAM,QAAQ,GAAG,IAAA,yCAAmB,GAAE,CAAC;IACvC,MAAM,eAAe,GAAG,IAAA,0CAAoB,GAAE,CAAC;IAE/C,IAAI;QACF,IAAI,eAAe,EAAE;YACnB,IAAI,QAAQ,CAAC,MAAM,EAAE;gBACnB,OAAO,CAAC,GAAG,CACT,4CAA4C,gBAAM,CAAC,IAAI,CACrD,mBAAmB,CACpB,qCAAqC,IAAA,wBAAc,EAAC,QAAQ,CAAC,EAAE,CACjE,CAAC;aACH;iBAAM;gBACL,OAAO,CAAC,GAAG,CACT,iDAAiD,gBAAM,CAAC,IAAI,CAC1D,mBAAmB,CACpB,EAAE,CACJ,CAAC;aACH;SACF;aAAM,IAAI,QAAQ,CAAC,MAAM,EAAE;YAC1B,OAAO,CAAC,GAAG,CACT,uEAAuE,IAAA,wBAAc,EACnF,QAAQ,CACT,EAAE,CACJ,CAAC;SACH;QACD,MAAM,IAAA,8BAAoB,EAAC;YACzB,UAAU,EAAE,KAAK;SAClB,CAAC,CAAC;KACJ;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,GAAG,CACT,kEAAkE,EAClE,KAAK,CACN,CAAC;QACF,IAAA,WAAI,EAAC,oCAAoC,CAAC,CAAC;KAC5C;AACH,CAAC,CAAC;AAEF,kBAAe,UAAU,CAAC"}

package/bin/lib/api.js

@@ -1,20 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = void 0;
-const axios_1 = __importDefault(require("axios"));
-const config_1 = __importDefault(require("./config"));
-const consts_1 = __importDefault(require("./consts"));
-const create = (token) => {
-    return axios_1.default.create({
-        baseURL: consts_1.default.API_HOST,
-        headers: {
-            Authorization: `token ${token}`,
-        },
-    });
-};
-exports.create = create;
-exports.default = (0, exports.create)(config_1.default.getToken(consts_1.default.CONFIG_FILE, consts_1.default.API_HOST));
-//# sourceMappingURL=api.js.map

package/bin/lib/api.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../lib/api.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,sDAA8B;AAC9B,sDAA8B;AAEvB,MAAM,MAAM,GAAG,CAAC,KAAc,EAAE,EAAE;IACvC,OAAO,eAAK,CAAC,MAAM,CAAC;QAClB,OAAO,EAAE,gBAAM,CAAC,QAAQ;QACxB,OAAO,EAAE;YACP,aAAa,EAAE,SAAS,KAAK,EAAE;SAChC;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAPW,QAAA,MAAM,UAOjB;AAEF,kBAAe,IAAA,cAAM,EAAC,gBAAM,CAAC,QAAQ,CAAC,gBAAM,CAAC,WAAW,EAAE,gBAAM,CAAC,QAAQ,CAAC,CAAC,CAAC"}