@baseplate-dev/core-generators 0.1.3 → 0.2.1

package/dist/renderers/typescript/imports/normalize-module-specifier.js

@@ -1,32 +1,32 @@
 import { minBy } from 'es-toolkit';
 import pathPosix from 'node:path/posix';
 /**
- * Strips the relative prefix from a project relative path
+ * Strips the relative prefix from a output relative path
  * @param path
  * @returns
  */
-function stripRelativePrefixFromProjectRelativePath(path) {
+function stripRelativePrefixFromOutputRelativePath(path) {
     if (path.startsWith('./')) {
         return path.slice(2);
     }
     if (path.startsWith('../')) {
-        throw new Error(`Expected project relative path, but got relative path ${path}`);
+        throw new Error(`Expected output relative path, but got relative path ${path}`);
     }
     return path;
 }
 /**
- * Attempts to resolve the aliased path from a project relative path
+ * Attempts to resolve the aliased path from a output relative path
  *
- * @param projectPath The project relative path to resolve from
+ * @param outputPath The output relative path to resolve from
  * @param TsPathMapEntry The path map entry to use
  * @returns The aliased path if the path map matches, otherwise undefined
  */
-function getAliasedPathFromTsPathMapEntry(projectPath, entry) {
-    const strippedProjectPath = stripRelativePrefixFromProjectRelativePath(projectPath);
-    const strippedToPath = stripRelativePrefixFromProjectRelativePath(entry.to);
+function getAliasedPathFromTsPathMapEntry(outputPath, entry) {
+    const strippedOutputPath = stripRelativePrefixFromOutputRelativePath(outputPath);
+    const strippedToPath = stripRelativePrefixFromOutputRelativePath(entry.to);
     const fromPath = entry.from;
     // return the from, if it's an exact match
-    if (strippedProjectPath === strippedToPath)
+    if (strippedOutputPath === strippedToPath)
         return fromPath;
     if (strippedToPath.includes('*')) {
         // validate from and to path
@@ -38,10 +38,10 @@ function getAliasedPathFromTsPathMapEntry(projectPath, entry) {
             throw new Error(`Path map entry 'from' path (${fromPath}) must end with /* for wildcard support`);
         }
         const toPathPrefix = strippedToPath.slice(0, -1);
-        if (!strippedProjectPath.startsWith(toPathPrefix))
+        if (!strippedOutputPath.startsWith(toPathPrefix))
             return undefined;
         return isFromPathWildcard
-            ? fromPath.slice(0, -1) + strippedProjectPath.slice(toPathPrefix.length)
+            ? fromPath.slice(0, -1) + strippedOutputPath.slice(toPathPrefix.length)
             : fromPath;
     }
     return undefined;
@@ -82,21 +82,21 @@ function normalizePathForResolutionKind(path, { moduleResolution, pathMapEntries
         : path.replace(/(\/index)?\.(j|t)sx?$/, '');
 }
 /**
- * Gets the project relative path from a module specifier
+ * Gets the output relative path from a module specifier
  *
- * @param moduleSpecifier The module specifier to get the project relative path from
+ * @param moduleSpecifier The module specifier to get the output relative path from
  * @param directory The directory we need to resolve the module specifier from
- * @returns The project relative path if the module specifier is internal, otherwise undefined
+ * @returns The output relative path if the module specifier is internal, otherwise undefined
  */
-export function getProjectRelativePathFromModuleSpecifier(moduleSpecifier, directory) {
+export function getOutputRelativePathFromModuleSpecifier(moduleSpecifier, directory) {
     // if not an internal import, just return undefined
     if (!moduleSpecifier.startsWith('@/') && !moduleSpecifier.startsWith('.')) {
         return undefined;
     }
-    const projectRelativePath = moduleSpecifier.startsWith('@/')
+    const outputRelativePath = moduleSpecifier.startsWith('@/')
         ? moduleSpecifier.slice(2)
         : pathPosix.join(directory, moduleSpecifier);
-    return projectRelativePath;
+    return outputRelativePath;
 }
 /**
  * Normalizes the module specifier to pick the best import path based on the following rules:
@@ -118,15 +118,15 @@ export function normalizeModuleSpecifier(moduleSpecifier, directory, options) {
         return moduleSpecifier;
     }
     // figure out the shortest way to resolve the module
-    const projectRelativePath = moduleSpecifier.startsWith('@/')
+    const outputRelativePath = moduleSpecifier.startsWith('@/')
         ? moduleSpecifier.slice(2)
         : pathPosix.join(directory, moduleSpecifier);
-    const relativePath = pathPosix.relative(directory, projectRelativePath);
+    const relativePath = pathPosix.relative(directory, outputRelativePath);
     const relativePathImport = relativePath.startsWith('.')
         ? relativePath
         : `./${relativePath}`;
     const typescriptPathImports = pathMapEntries
-        ?.map((entry) => getAliasedPathFromTsPathMapEntry(projectRelativePath, entry))
+        ?.map((entry) => getAliasedPathFromTsPathMapEntry(outputRelativePath, entry))
         .filter((x) => x !== undefined) ?? [];
     return normalizePathForResolutionKind(minBy([relativePathImport, ...typescriptPathImports], (x) => x.length), options);
 }

package/dist/renderers/typescript/imports/normalize-module-specifier.js.map

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

package/dist/renderers/typescript/imports/ts-morph-operations.d.ts

@@ -1,4 +1,4 @@
-import { type CodeBlockWriter, type ImportDeclaration, type SourceFile } from 'ts-morph';
+import type { CodeBlockWriter, ImportDeclaration, SourceFile } from 'ts-morph';
 import type { TsImportDeclaration } from './types.js';
 /**
  * Get all side effect imports from a source file

package/dist/renderers/typescript/imports/ts-morph-operations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ts-morph-operations.d.ts","sourceRoot":"","sources":["../../../../src/renderers/typescript/imports/ts-morph-operations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,iBAAiB,EAEtB,KAAK,UAAU,EAChB,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAWtD;;;;GAIG;AACH,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,UAAU,GACf,iBAAiB,EAAE,CAErB;AAED;;;;GAIG;AACH,wBAAgB,0CAA0C,CACxD,IAAI,EAAE,UAAU,GACf,iBAAiB,EAAE,CAIrB;AAED;;;;GAIG;AACH,wBAAgB,oDAAoD,CAClE,WAAW,EAAE,iBAAiB,GAC7B,mBAAmB,CAYrB;AAkDD;;;;GAIG;AACH,wBAAgB,iDAAiD,CAC/D,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,mBAAmB,EAAE,EAAE,GAC/B,IAAI,CAON;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qCAAqC,CACnD,UAAU,EAAE,UAAU,EACtB,qBAAqB,EAAE,iBAAiB,EAAE,EAC1C,qBAAqB,EAAE,mBAAmB,EAAE,EAAE,EAC9C,EACE,mBAAmB,EACnB,kBAAkB,GACnB,GAAE;IACD,mBAAmB,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,CAAC;IACxD,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,CAAC;CACnD,GACL,IAAI,CAiDN"}
+{"version":3,"file":"ts-morph-operations.d.ts","sourceRoot":"","sources":["../../../../src/renderers/typescript/imports/ts-morph-operations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAI/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAWtD;;;;GAIG;AACH,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,UAAU,GACf,iBAAiB,EAAE,CAErB;AAED;;;;GAIG;AACH,wBAAgB,0CAA0C,CACxD,IAAI,EAAE,UAAU,GACf,iBAAiB,EAAE,CAIrB;AAED;;;;GAIG;AACH,wBAAgB,oDAAoD,CAClE,WAAW,EAAE,iBAAiB,GAC7B,mBAAmB,CAYrB;AAkDD;;;;GAIG;AACH,wBAAgB,iDAAiD,CAC/D,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,mBAAmB,EAAE,EAAE,GAC/B,IAAI,CAON;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qCAAqC,CACnD,UAAU,EAAE,UAAU,EACtB,qBAAqB,EAAE,iBAAiB,EAAE,EAC1C,qBAAqB,EAAE,mBAAmB,EAAE,EAAE,EAC9C,EACE,mBAAmB,EACnB,kBAAkB,GACnB,GAAE;IACD,mBAAmB,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,CAAC;IACxD,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,CAAC;CACnD,GACL,IAAI,CAoDN"}

package/dist/renderers/typescript/imports/ts-morph-operations.js

@@ -1,4 +1,4 @@
-import { Node, } from 'ts-morph';
+import { Node } from 'ts-morph';
 function isSideEffectImport(declaration) {
     return (!declaration.isTypeOnly() &&
         declaration.getNamespaceImport() === undefined &&
@@ -116,7 +116,7 @@ export function replaceImportDeclarationsInSourceFile(sourceFile, oldImportDecla
             const child = children[0];
             return !Node.isStringLiteral(child);
         });
-    const insertionPosition = firstNonDirectiveNode?.getNonWhitespaceStart() ?? 0;
+    const insertionPosition = firstNonDirectiveNode?.getFullStart() ?? 0;
     // special case shebang to remove the first line if it's a shebang
     const firstNonDirectiveNodeHasShebang = firstNonDirectiveNode
         ?.getFullText()
@@ -128,6 +128,9 @@ export function replaceImportDeclarationsInSourceFile(sourceFile, oldImportDecla
         if (beforeImportsWriter) {
             beforeImportsWriter(writer);
         }
+        if (insertionPosition > 0) {
+            writer.blankLineIfLastNot();
+        }
         writeGroupedImportDeclarationsWithCodeBlockWriter(writer, newImportDeclarations);
         if (afterImportsWriter) {
             afterImportsWriter(writer);

package/dist/renderers/typescript/imports/ts-morph-operations.js.map

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

package/dist/renderers/typescript/imports/types.d.ts

@@ -67,7 +67,7 @@ export interface TsImportDeclaration {
 export interface TsPathMapEntry {
     /** The alias to map from (e.g. "@src/*") */
     from: string;
-    /** The project relative path to map to (e.g. "./src/app/*") */
+    /** The output relative path to map to (e.g. "./src/app/*") */
     to: string;
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/renderers/typescript/imports/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/renderers/typescript/imports/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,YAAY,CAAC,EAAE,aAAa,EAAE,CAAC;CAChC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,WAAW,cAAc;IAC7B,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,+DAA+D;IAC/D,EAAE,EAAE,MAAM,CAAC;CACZ"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/renderers/typescript/imports/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,YAAY,CAAC,EAAE,aAAa,EAAE,CAAC;CAChC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,WAAW,cAAc;IAC7B,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,8DAA8D;IAC9D,EAAE,EAAE,MAAM,CAAC;CACZ"}

package/dist/renderers/typescript/index.d.ts

@@ -1,5 +1,4 @@
 export * from './actions/index.js';
-export * from './extractor/index.js';
 export * from './fragments/index.js';
 export * from './import-maps/index.js';
 export * from './imports/index.js';

package/dist/renderers/typescript/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/renderers/typescript/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/renderers/typescript/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC"}

package/dist/renderers/typescript/index.js

@@ -1,5 +1,4 @@
 export * from './actions/index.js';
-export * from './extractor/index.js';
 export * from './fragments/index.js';
 export * from './import-maps/index.js';
 export * from './imports/index.js';

package/dist/renderers/typescript/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/renderers/typescript/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/renderers/typescript/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC"}

package/dist/renderers/typescript/renderers/template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../../../src/renderers/typescript/renderers/template.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAIzE,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAcD;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,2BAA2B,CAAC,EACtD,OAAO,GAAE,uBAA4B,GACpC,cAAc,CAsLhB"}
+{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../../../src/renderers/typescript/renderers/template.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAIzE,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAcD;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,2BAA2B,CAAC,EACtD,OAAO,GAAE,uBAA4B,GACpC,cAAc,CAiMhB"}

package/dist/renderers/typescript/renderers/template.js

@@ -66,7 +66,7 @@ export function renderTsTemplateToTsCodeFragment(template, variables, options =
     });
     // --- Pass 4: Replace inline placeholders with unique markers ---
     // This regex ensures the TPL_ variable is not immediately followed by another valid variable character
-    const inlineRegex = new RegExp(`(${prefix}[A-Z0-9_]+)([^A-Z0-9_]|$)`, 'g');
+    const inlineRegex = new RegExp(`(${prefix}[A-Z0-9_]+)([^A-Z0-9_]|$)`, 'gm');
     renderedTemplate = renderedTemplate.replace(inlineRegex, (match, key, followingCharacter) => {
         if (!(key in variables)) {
             throw new Error(`Template variable not found: ${key}`);
@@ -81,6 +81,9 @@ export function renderTsTemplateToTsCodeFragment(template, variables, options =
         variableKeys.delete(key); // Mark as used
         return `${marker}${shouldRemoveComma ? '' : followingCharacter}`; // Replace with marker
     });
+    // Workaround: Replace any whitespace around inline markers with parentheses with just the marker
+    // e.g. ( \n __INLINE_MARKER_0__  \n ) => (__INLINE_MARKER_0__)
+    renderedTemplate = renderedTemplate.replaceAll(/\((\s*)(__INLINE_MARKER_\d+__)(\s*)\)/g, (match, beforeWhitespace, marker) => `(${marker})`);
     // --- Check for unused variables ---
     if (variableKeys.size > 0) {
         throw new Error(`Template variables were unused in template: ${[...variableKeys].join(', ')}`);
@@ -90,7 +93,9 @@ export function renderTsTemplateToTsCodeFragment(template, variables, options =
     for (const [marker, { key, leading, value }] of blockMarkers.entries()) {
         const contents = typeof value === 'string' ? value : value.contents;
         const replacement = includeMetadata
-            ? `${leading}/* ${key}:START */\n${contents}\n${leading}/* ${key}:END */` // Preserve indentation for end comment too
+            ? contents.trim() === ''
+                ? `${leading}/* ${key}:BLOCK */`
+                : `${leading}/* ${key}:START */\n${contents}\n${leading}/* ${key}:END */` // Preserve indentation for end comment too
             : contents; // Note: leading whitespace is handled by the marker's position
         // Use replace instead of replaceAll as markers are unique
         renderedTemplate = renderedTemplate.replace(marker, escapeReplacement(replacement));
@@ -117,7 +122,9 @@ export function renderTsTemplateToTsCodeFragment(template, variables, options =
     for (const [marker, { key, value }] of inlineMarkers.entries()) {
         const contents = typeof value === 'string' ? value : value.contents;
         const replacement = includeMetadata
-            ? `/* ${key}:START */ ${contents.trim()} /* ${key}:END */`
+            ? contents.trim() === ''
+                ? `/* ${key}:INLINE */`
+                : `/* ${key}:START */ ${contents.trim()} /* ${key}:END */`
             : contents;
         // Use replace instead of replaceAll as markers are unique
         renderedTemplate = renderedTemplate.replace(marker, escapeReplacement(replacement));

package/dist/renderers/typescript/renderers/template.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../src/renderers/typescript/renderers/template.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../src/renderers/typescript/renderers/template.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAa1E;;;;;;;GAOG;AACH,SAAS,iBAAiB,CAAC,WAAmB;IAC5C,OAAO,WAAW,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC7C,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,gCAAgC,CAC9C,QAAgB,EAChB,SAAsD,EACtD,UAAmC,EAAE;IAErC,mCAAmC;IACnC,IAAI,gBAAgB,GAAG,QAAQ,CAAC,OAAO,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC;IACpE,sCAAsC;IACtC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC;IACxC,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,KAAK,CAAC;IACzD,IACE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CACzB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAC9D,EACD,CAAC;QACD,MAAM,IAAI,KAAK,CACb,mFAAmF,MAAM,EAAE,CAC5F,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,IAAI,GAAG,EAGzB,CAAC;IACJ,MAAM,aAAa,GAAG,IAAI,GAAG,EAG1B,CAAC;IACJ,MAAM,UAAU,GAAG,IAAI,GAAG,EAGvB,CAAC;IACJ,MAAM,cAAc,GAAG,IAAI,GAAG,EAG3B,CAAC;IAEJ,iEAAiE;IACjE,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,cAAc,MAAM,eAAe,EAAE,IAAI,CAAC,CAAC;IACzE,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CACzC,UAAU,EACV,CAAC,KAAK,EAAE,OAAe,EAAE,GAAW,EAAE,EAAE;QACtC,IAAI,CAAC,CAAC,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,EAAE,CAAC,CAAC;QACzD,CAAC;QAED,MAAM,MAAM,GAAG,kBAAkB,YAAY,CAAC,IAAI,IAAI,CAAC,CAAC,gBAAgB;QACxE,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAClE,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe;QAEzC,OAAO,GAAG,OAAO,GAAG,MAAM,EAAE,CAAC,CAAC,qDAAqD;IACrF,CAAC,CACF,CAAC;IAEF,+DAA+D;IAC/D,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,KAAK,MAAM,gBAAgB,EAAE,GAAG,CAAC,CAAC;IAC9D,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CACzC,QAAQ,EACR,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE;QACrB,IAAI,CAAC,CAAC,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,EAAE,CAAC,CAAC;QACzD,CAAC;QAED,MAAM,MAAM,GAAG,gBAAgB,UAAU,CAAC,IAAI,IAAI,CAAC,CAAC,gBAAgB;QACpE,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvD,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe;QAEzC,OAAO,MAAM,CAAC,CAAC,qDAAqD;IACtE,CAAC,CACF,CAAC;IAEF,mEAAmE;IACnE,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,WAAW,MAAM,oBAAoB,EAAE,GAAG,CAAC,CAAC;IAC5E,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CACzC,YAAY,EACZ,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE;QACrB,IAAI,CAAC,CAAC,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,EAAE,CAAC,CAAC;QACzD,CAAC;QAED,MAAM,MAAM,GAAG,oBAAoB,cAAc,CAAC,IAAI,IAAI,CAAC,CAAC,gBAAgB;QAC5E,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC3D,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe;QAEzC,OAAO,MAAM,CAAC,CAAC,sBAAsB;IACvC,CAAC,CACF,CAAC;IAEF,kEAAkE;IAClE,uGAAuG;IACvG,MAAM,WAAW,GAAG,IAAI,MAAM,CAAC,IAAI,MAAM,2BAA2B,EAAE,IAAI,CAAC,CAAC;IAC5E,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CACzC,WAAW,EACX,CAAC,KAAK,EAAE,GAAW,EAAE,kBAA0B,EAAE,EAAE;QACjD,IAAI,CAAC,CAAC,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,EAAE,CAAC,CAAC;QACzD,CAAC;QACD,4FAA4F;QAC5F,gGAAgG;QAChG,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,QAAQ,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC;QACpE,MAAM,iBAAiB,GACrB,kBAAkB,KAAK,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;QAEvD,MAAM,MAAM,GAAG,mBAAmB,aAAa,CAAC,IAAI,IAAI,CAAC,CAAC,gBAAgB;QAC1E,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1C,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe;QAEzC,OAAO,GAAG,MAAM,GAAG,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,EAAE,CAAC,CAAC,sBAAsB;IAC1F,CAAC,CACF,CAAC;IAEF,iGAAiG;IACjG,+DAA+D;IAC/D,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAC5C,wCAAwC,EACxC,CAAC,KAAK,EAAE,gBAAwB,EAAE,MAAc,EAAE,EAAE,CAAC,IAAI,MAAM,GAAG,CACnE,CAAC;IAEF,qCAAqC;IACrC,IAAI,YAAY,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CACb,+CAA+C,CAAC,GAAG,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC9E,CAAC;IACJ,CAAC;IAED,kCAAkC;IAClC,wBAAwB;IACxB,KAAK,MAAM,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,IAAI,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;QACvE,MAAM,QAAQ,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC;QACpE,MAAM,WAAW,GAAG,eAAe;YACjC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE;gBACtB,CAAC,CAAC,GAAG,OAAO,MAAM,GAAG,WAAW;gBAChC,CAAC,CAAC,GAAG,OAAO,MAAM,GAAG,cAAc,QAAQ,KAAK,OAAO,MAAM,GAAG,SAAS,CAAC,2CAA2C;YACvH,CAAC,CAAC,QAAQ,CAAC,CAAC,+DAA+D;QAE7E,0DAA0D;QAC1D,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CACzC,MAAM,EACN,iBAAiB,CAAC,WAAW,CAAC,CAC/B,CAAC;IACJ,CAAC;IAED,sBAAsB;IACtB,KAAK,MAAM,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QAC5D,MAAM,QAAQ,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC;QACpE,MAAM,WAAW,GAAG,eAAe;YACjC,CAAC,CAAC,OAAO,GAAG,eAAe,QAAQ,SAAS,GAAG,UAAU;YACzD,CAAC,CAAC,QAAQ,CAAC;QAEb,0DAA0D;QAC1D,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CACzC,MAAM,EACN,iBAAiB,CAAC,WAAW,CAAC,CAC/B,CAAC;IACJ,CAAC;IAED,0BAA0B;IAC1B,KAAK,MAAM,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,IAAI,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC;QAChE,MAAM,QAAQ,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC;QACpE,MAAM,WAAW,GAAG,eAAe;YACjC,CAAC,CAAC,MAAM,GAAG,sBAAsB,QAAQ,QAAQ,GAAG,iBAAiB;YACrE,CAAC,CAAC,QAAQ,CAAC;QAEb,0DAA0D;QAC1D,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CACzC,MAAM,EACN,iBAAiB,CAAC,WAAW,CAAC,CAC/B,CAAC;IACJ,CAAC;IAED,yBAAyB;IACzB,KAAK,MAAM,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,IAAI,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC;QAC/D,MAAM,QAAQ,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC;QACpE,MAAM,WAAW,GAAG,eAAe;YACjC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE;gBACtB,CAAC,CAAC,MAAM,GAAG,YAAY;gBACvB,CAAC,CAAC,MAAM,GAAG,aAAa,QAAQ,CAAC,IAAI,EAAE,OAAO,GAAG,SAAS;YAC5D,CAAC,CAAC,QAAQ,CAAC;QAEb,0DAA0D;QAC1D,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CACzC,MAAM,EACN,iBAAiB,CAAC,WAAW,CAAC,CAC/B,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,iCAAiC,CACrE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,CAClE,CAAC;IAEF,OAAO;QACL,QAAQ,EAAE,gBAAgB;QAC1B,OAAO;QACP,gBAAgB;KACjB,CAAC;AACJ,CAAC"}