@backtickjs/builds 0.1.8 → 0.1.10

package/README.md

@@ -10,21 +10,25 @@ npm install @backtickjs/builds
 
 ## How it works
 
-1. **The app declares what it offers to screens** in a module map, one per platform as Metro picks files: `moduleMap.ts` for iOS and Android, and `moduleMap.web.ts` for the web. A module map is a table and nothing else, so it can be read without running it:
+1. **The app declares what it offers to screens** in a module map, one per platform as Metro picks files: `moduleMap.ts` for iOS and Android, and `moduleMap.web.ts` for the web. A module map is imports and a table, nothing else, so it can be read without running it:
 
    ```ts
    // moduleMap.ts
    import type { ModuleMap } from "@backtickjs/react-native-client";
+   import * as React from "react";
+   import * as JSXRuntime from "react/jsx-runtime";
+   import * as ReactNative from "react-native";
+   import * as Facebook from "react-native-fbsdk-next";
 
    export const moduleMap = {
-     react: () => require("react"),
-     "react/jsx-runtime": () => require("react/jsx-runtime"),
-     "react-native": () => require("react-native"),
-     "react-native-fbsdk-next": () => require("react-native-fbsdk-next"),
+     react: React,
+     "react/jsx-runtime": JSXRuntime,
+     "react-native": ReactNative,
+     "react-native-fbsdk-next": Facebook,
    } satisfies ModuleMap;
    ```
 
-   An entry that decides at runtime, like `native() ? require("…") : {}`, is an error. What a platform lacks, its map leaves out.
+   Each entry is `"specifier": Name`, with `Name` imported above. An entry that decides at runtime, like `native ? Facebook : {}`, is an error. What a platform lacks, its map leaves out.
 
 2. **Each build gets an id:** a hash of the modules its platform's map offers, each at the installed version of its package. `app.config.ts` puts the ids in the app config:
 
@@ -91,7 +95,7 @@ npm install @backtickjs/builds
 `modulesOf` throws for a build its server can't draw for:
 
 - **`UnknownBuild`**: no id, or one that isn't registered. Every build is registered before it ships, so this means the server or the build was deployed wrong, as when a server is rolled back past a build in users' hands. Answer it as a server error.
-- **`DeprecatedBuild`**: a build you retired by setting `"deprecated": true` in its file. Answer it with something your app shell recognises and turns into "update the app", such as HTTP 426. The shell has to know that answer before the build is retired, so ship it in your first build.
+- **`DeprecatedBuild`**: a build you retired by setting `"deprecated": true` in its file. It carries the build's `modules`, so your server can still draw that build one screen, bundled for what it has: one asking its users to update. Answer every path with it.
 
 ## API
 

package/dist/builds.d.ts

@@ -15,10 +15,15 @@ export declare class UnknownBuild extends Error {
     readonly buildId: string | null;
     constructor(buildId: string | null);
 }
-/** A build its server no longer draws for, on purpose: its users are asked to update. */
+/**
+ * A build its server no longer draws its screens for, on purpose. It carries
+ * the build's modules, so the server can still draw it one screen, built for
+ * what the build has: one asking its users to update.
+ */
 export declare class DeprecatedBuild extends Error {
     readonly buildId: string;
-    constructor(buildId: string);
+    readonly modules: Modules;
+    constructor(buildId: string, modules: Modules);
 }
 /** Where an app keeps its registered builds, one file each: `builds/`. */
 export declare function buildsDirectory(projectRoot: string): string;

package/dist/builds.js

@@ -17,12 +17,18 @@ export class UnknownBuild extends Error {
         this.buildId = buildId;
     }
 }
-/** A build its server no longer draws for, on purpose: its users are asked to update. */
+/**
+ * A build its server no longer draws its screens for, on purpose. It carries
+ * the build's modules, so the server can still draw it one screen, built for
+ * what the build has: one asking its users to update.
+ */
 export class DeprecatedBuild extends Error {
     buildId;
-    constructor(buildId) {
+    modules;
+    constructor(buildId, modules) {
         super(`Build ${JSON.stringify(buildId)} is deprecated.`);
         this.buildId = buildId;
+        this.modules = modules;
     }
 }
 /** Where an app keeps its registered builds, one file each: `builds/`. */
@@ -67,7 +73,7 @@ export function createBuilds({ projectRoot }) {
         modulesOf(buildId) {
             const build = buildId === null ? undefined : registered.get(buildId);
             if (build?.deprecated)
-                throw new DeprecatedBuild(buildId);
+                throw new DeprecatedBuild(buildId, build.modules);
             if (build !== undefined)
                 return build.modules;
             const current = platforms

package/dist/builds.js.map

@@ -1 +1 @@
-{"version":3,"file":"builds.js","sourceRoot":"","sources":["../src/builds.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"builds.js","sourceRoot":"","sources":["../src/builds.ts"],"names":[],"mappings":"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"}

package/dist/moduleMap.d.ts

@@ -3,10 +3,10 @@ export declare const platforms: readonly ["ios", "android", "web"];
 export type Platform = (typeof platforms)[number];
 /**
  * The specifiers a module map offers, read from its source without running
- * it: `export const moduleMap = { … }`, each entry `() => require("…")`, and
- * nothing else but type imports. Anything more, as a check of the platform,
- * would make what a build offers something only the device knows, so it
- * throws, naming the line.
+ * it: imports, and `export const moduleMap = { … }`, each entry
+ * `"specifier": Name` with `Name` bound by an import. Anything more, as a
+ * check of the platform, would make what a build offers something only the
+ * device knows, so it throws, naming the line.
  */
 export declare function readModuleMap(file: string): string[];
 /**

package/dist/moduleMap.js

@@ -8,10 +8,10 @@ export const platforms = ["ios", "android", "web"];
 const require = createRequire(import.meta.url);
 /**
  * The specifiers a module map offers, read from its source without running
- * it: `export const moduleMap = { … }`, each entry `() => require("…")`, and
- * nothing else but type imports. Anything more, as a check of the platform,
- * would make what a build offers something only the device knows, so it
- * throws, naming the line.
+ * it: imports, and `export const moduleMap = { … }`, each entry
+ * `"specifier": Name` with `Name` bound by an import. Anything more, as a
+ * check of the platform, would make what a build offers something only the
+ * device knows, so it throws, naming the line.
  */
 export function readModuleMap(file) {
     const ts = require("typescript");
@@ -20,10 +20,25 @@ export function readModuleMap(file) {
         const { line } = source.getLineAndCharacterOfPosition(node.getStart(source));
         return new Error(`${file}:${line + 1}: ${what}`);
     };
+    const imported = new Set();
     let map;
     for (const statement of source.statements) {
-        if (ts.isImportDeclaration(statement) &&
-            statement.importClause?.isTypeOnly) {
+        if (ts.isImportDeclaration(statement)) {
+            const clause = statement.importClause;
+            if (clause !== undefined && !clause.isTypeOnly) {
+                if (clause.name !== undefined)
+                    imported.add(clause.name.text);
+                const bindings = clause.namedBindings;
+                if (bindings !== undefined && ts.isNamespaceImport(bindings)) {
+                    imported.add(bindings.name.text);
+                }
+                else if (bindings !== undefined) {
+                    for (const element of bindings.elements) {
+                        if (!element.isTypeOnly)
+                            imported.add(element.name.text);
+                    }
+                }
+            }
             continue;
         }
         const declaration = ts.isVariableStatement(statement)
@@ -40,24 +55,20 @@ export function readModuleMap(file) {
             map = value;
             continue;
         }
-        throw wrong(statement, "a module map holds `export const moduleMap = { … }` and type imports only");
+        throw wrong(statement, "a module map holds imports and `export const moduleMap = { … }` only");
     }
     if (map === undefined) {
-        throw new Error(`${file}: no \`export const moduleMap = { … }\``);
+        throw new Error(file + ": no `export const moduleMap = { … }`");
     }
     return map.properties.map((property) => {
         const entry = ts.isPropertyAssignment(property) &&
             (ts.isIdentifier(property.name) || ts.isStringLiteral(property.name)) &&
-            ts.isArrowFunction(property.initializer) &&
-            property.initializer.parameters.length === 0 &&
-            ts.isCallExpression(property.initializer.body) &&
-            property.initializer.body.expression.getText(source) === "require" &&
-            property.initializer.body.arguments.length === 1 &&
-            ts.isStringLiteral(property.initializer.body.arguments[0])
+            ts.isIdentifier(property.initializer) &&
+            imported.has(property.initializer.text)
             ? property.name
             : undefined;
         if (entry === undefined) {
-            throw wrong(property, 'each entry is `"specifier": () => require("…")`');
+            throw wrong(property, 'each entry is `"specifier": Name`, with `Name` imported above');
         }
         return entry.text;
     });

package/dist/moduleMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"moduleMap.js","sourceRoot":"","sources":["../src/moduleMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,uEAAuE;AACvE,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAU,CAAC;AAG5D,4EAA4E;AAC5E,yBAAyB;AACzB,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE/C;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAgC,CAAC;IAChE,MAAM,MAAM,GAAG,EAAE,CAAC,gBAAgB,CAChC,IAAI,EACJ,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,EAC1B,EAAE,CAAC,YAAY,CAAC,MAAM,CACvB,CAAC;IACF,MAAM,KAAK,GAAG,CAAC,IAA+B,EAAE,IAAY,EAAE,EAAE;QAC9D,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,6BAA6B,CACnD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CACtB,CAAC;QACF,OAAO,IAAI,KAAK,CAAC,GAAG,IAAI,IAAI,IAAI,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC;IACF,IAAI,GAA6D,CAAC;IAClE,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QAC1C,IACE,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC;YACjC,SAAS,CAAC,YAAY,EAAE,UAAU,EAClC,CAAC;YACD,SAAS;QACX,CAAC;QACD,MAAM,WAAW,GAAG,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC;YACnD,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC;YAC3C,CAAC,CAAC,SAAS,CAAC;QACd,IAAI,KAAK,GAAG,WAAW,EAAE,WAAW,CAAC;QACrC,IAAI,KAAK,KAAK,SAAS,IAAI,EAAE,CAAC,qBAAqB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3D,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC;QAC3B,CAAC;QACD,IACE,GAAG,KAAK,SAAS;YACjB,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,WAAW;YACjD,KAAK,KAAK,SAAS;YACnB,EAAE,CAAC,yBAAyB,CAAC,KAAK,CAAC,EACnC,CAAC;YACD,GAAG,GAAG,KAAK,CAAC;YACZ,SAAS;QACX,CAAC;QACD,MAAM,KAAK,CACT,SAAS,EACT,2EAA2E,CAC5E,CAAC;IACJ,CAAC;IACD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,yCAAyC,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QACrC,MAAM,KAAK,GACT,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC;YACjC,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACrE,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,WAAW,CAAC;YACxC,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC;YAC5C,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC;YAC9C,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,SAAS;YAClE,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;YAChD,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAE,CAAC;YACzD,CAAC,CAAC,QAAQ,CAAC,IAAI;YACf,CAAC,CAAC,SAAS,CAAC;QAChB,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,KAAK,CAAC,QAAQ,EAAE,iDAAiD,CAAC,CAAC;QAC3E,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC;IACpB,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,WAAmB,EAAE,QAAkB;IACnE,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACzE,KAAK,MAAM,SAAS,IAAI,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;QACtE,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,YAAY,SAAS,KAAK,CAAC,CAAC;QAC3D,IAAI,UAAU,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;IACpC,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,GAAG,WAAW,mBAAmB,CAAC,CAAC;AACrD,CAAC"}
+{"version":3,"file":"moduleMap.js","sourceRoot":"","sources":["../src/moduleMap.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backtickjs/builds",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Keeps a Backtick server drawing for every build of its app in users' hands: build ids, a registry of what each build carries, and a check for EAS builds",
   "keywords": [
     "backtick",
@@ -40,7 +40,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@backtickjs/bundler": "^0.1.8",
+    "@backtickjs/bundler": "^0.1.10",
     "typescript": "^6.0.3"
   },
   "devDependencies": {

package/src/builds.ts

@@ -35,9 +35,16 @@ export class UnknownBuild extends Error {
   }
 }
 
-/** A build its server no longer draws for, on purpose: its users are asked to update. */
+/**
+ * A build its server no longer draws its screens for, on purpose. It carries
+ * the build's modules, so the server can still draw it one screen, built for
+ * what the build has: one asking its users to update.
+ */
 export class DeprecatedBuild extends Error {
-  constructor(readonly buildId: string) {
+  constructor(
+    readonly buildId: string,
+    readonly modules: Modules,
+  ) {
     super(`Build ${JSON.stringify(buildId)} is deprecated.`);
   }
 }
@@ -107,7 +114,7 @@ export function createBuilds({ projectRoot }: { projectRoot: string }): Builds {
   return {
     modulesOf(buildId) {
       const build = buildId === null ? undefined : registered.get(buildId);
-      if (build?.deprecated) throw new DeprecatedBuild(buildId!);
+      if (build?.deprecated) throw new DeprecatedBuild(buildId!, build.modules);
       if (build !== undefined) return build.modules;
       const current = platforms
         .map(installedOn)

package/src/moduleMap.ts

@@ -12,10 +12,10 @@ const require = createRequire(import.meta.url);
 
 /**
  * The specifiers a module map offers, read from its source without running
- * it: `export const moduleMap = { … }`, each entry `() => require("…")`, and
- * nothing else but type imports. Anything more, as a check of the platform,
- * would make what a build offers something only the device knows, so it
- * throws, naming the line.
+ * it: imports, and `export const moduleMap = { … }`, each entry
+ * `"specifier": Name` with `Name` bound by an import. Anything more, as a
+ * check of the platform, would make what a build offers something only the
+ * device knows, so it throws, naming the line.
  */
 export function readModuleMap(file: string): string[] {
   const ts = require("typescript") as typeof import("typescript");
@@ -30,12 +30,22 @@ export function readModuleMap(file: string): string[] {
     );
     return new Error(`${file}:${line + 1}: ${what}`);
   };
+  const imported = new Set<string>();
   let map: import("typescript").ObjectLiteralExpression | undefined;
   for (const statement of source.statements) {
-    if (
-      ts.isImportDeclaration(statement) &&
-      statement.importClause?.isTypeOnly
-    ) {
+    if (ts.isImportDeclaration(statement)) {
+      const clause = statement.importClause;
+      if (clause !== undefined && !clause.isTypeOnly) {
+        if (clause.name !== undefined) imported.add(clause.name.text);
+        const bindings = clause.namedBindings;
+        if (bindings !== undefined && ts.isNamespaceImport(bindings)) {
+          imported.add(bindings.name.text);
+        } else if (bindings !== undefined) {
+          for (const element of bindings.elements) {
+            if (!element.isTypeOnly) imported.add(element.name.text);
+          }
+        }
+      }
       continue;
     }
     const declaration = ts.isVariableStatement(statement)
@@ -56,26 +66,25 @@ export function readModuleMap(file: string): string[] {
     }
     throw wrong(
       statement,
-      "a module map holds `export const moduleMap = { … }` and type imports only",
+      "a module map holds imports and `export const moduleMap = { … }` only",
     );
   }
   if (map === undefined) {
-    throw new Error(`${file}: no \`export const moduleMap = { … }\``);
+    throw new Error(file + ": no `export const moduleMap = { … }`");
   }
   return map.properties.map((property) => {
     const entry =
       ts.isPropertyAssignment(property) &&
       (ts.isIdentifier(property.name) || ts.isStringLiteral(property.name)) &&
-      ts.isArrowFunction(property.initializer) &&
-      property.initializer.parameters.length === 0 &&
-      ts.isCallExpression(property.initializer.body) &&
-      property.initializer.body.expression.getText(source) === "require" &&
-      property.initializer.body.arguments.length === 1 &&
-      ts.isStringLiteral(property.initializer.body.arguments[0]!)
+      ts.isIdentifier(property.initializer) &&
+      imported.has(property.initializer.text)
         ? property.name
         : undefined;
     if (entry === undefined) {
-      throw wrong(property, 'each entry is `"specifier": () => require("…")`');
+      throw wrong(
+        property,
+        'each entry is `"specifier": Name`, with `Name` imported above',
+      );
     }
     return entry.text;
   });

package/dist/packages.d.ts

@@ -1,14 +0,0 @@
-import { type Packages } from "@backtickjs/bundler";
-import { type Platform } from "./moduleMap.js";
-/**
- * The versions of the packages the module map for `platform` offers, as
- * installed in the app at `projectRoot`: what a build made from it now
- * carries there.
- */
-export declare function installedPackages(projectRoot: string, platform: Platform): Packages;
-/**
- * The id of a build that carries `packages`: a hash of them, so two builds
- * that carry the same share it, and a build always names exactly what it
- * has.
- */
-export declare function buildIdOf(packages: Packages): string;

package/dist/packages.js

@@ -1,34 +0,0 @@
-import { createHash } from "node:crypto";
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
-import { packageOf } from "@backtickjs/bundler";
-import { moduleMapFile, readModuleMap } from "./moduleMap.js";
-/**
- * The versions of the packages the module map for `platform` offers, as
- * installed in the app at `projectRoot`: what a build made from it now
- * carries there.
- */
-export function installedPackages(projectRoot, platform) {
-    const specifiers = readModuleMap(moduleMapFile(projectRoot, platform));
-    const names = [...new Set(specifiers.map(packageOf))].sort();
-    return Object.fromEntries(names.map((name) => {
-        const file = join(projectRoot, "node_modules", name, "package.json");
-        const { version } = JSON.parse(readFileSync(file, "utf8"));
-        return [name, version];
-    }));
-}
-/**
- * The id of a build that carries `packages`: a hash of them, so two builds
- * that carry the same share it, and a build always names exactly what it
- * has.
- */
-export function buildIdOf(packages) {
-    const sorted = Object.keys(packages)
-        .sort()
-        .map((name) => [name, packages[name]]);
-    return createHash("sha256")
-        .update(JSON.stringify(sorted))
-        .digest("hex")
-        .slice(0, 16);
-}
-//# sourceMappingURL=packages.js.map

package/dist/packages.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"packages.js","sourceRoot":"","sources":["../src/packages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAiB,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAiB,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE7E;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAC/B,WAAmB,EACnB,QAAkB;IAElB,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;IACvE,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7D,OAAO,MAAM,CAAC,WAAW,CACvB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACjB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAExD,CAAC;QACF,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzB,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,SAAS,CAAC,QAAkB;IAC1C,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;SACjC,IAAI,EAAE;SACN,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzC,OAAO,UAAU,CAAC,QAAQ,CAAC;SACxB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;SAC9B,MAAM,CAAC,KAAK,CAAC;SACb,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAClB,CAAC"}