@analogjs/vite-plugin-angular 3.0.0-alpha.44 → 3.0.0-alpha.45

package/src/lib/utils/virtual-resources.js.map

@@ -1 +1 @@
-{"version":3,"file":"virtual-resources.js","names":[],"sources":["../../../../src/lib/utils/virtual-resources.ts"],"sourcesContent":["// Shared Vite plugin helpers for routing component resources (templates,\n// external styles) through virtual module ids. Both angular-vite-plugin and\n// fast-compile-plugin use these so the rewriting + loading behavior stays\n// in sync between them.\n\nimport { promises as fsPromises } from 'node:fs';\nimport { dirname, isAbsolute, resolve } from 'node:path';\nimport { normalizePath, preprocessCSS, type ResolvedConfig } from 'vite';\n\nimport {\n  fromVirtualRawId,\n  fromVirtualStyleId,\n  isVirtualRawId,\n  isVirtualStyleId,\n  toVirtualRawId,\n  toVirtualStyleId,\n} from './virtual-ids.js';\n\nconst INLINE_STYLE_QUERY_RE = /\\.(css|scss|sass|less)\\?inline$/;\n\ninterface PluginContextLike {\n  addWatchFile(path: string): void;\n}\n\ntype CssPattern = string | RegExp;\n\ntype VitestCssOption =\n  | boolean\n  | undefined\n  | {\n      // Vitest accepts both single patterns and arrays for include/exclude.\n      include?: CssPattern | CssPattern[];\n      exclude?: CssPattern | CssPattern[];\n    };\n\n/**\n * True when the given stylesheet should be run through Vite's `preprocessCSS`,\n * given Vitest's `test.css` semantics:\n *\n *   - non-test contexts        → always preprocess\n *   - `test.css: true`         → always preprocess\n *   - `test.css: false`        → never preprocess\n *   - `test.css: { include }`  → preprocess only when `filePath` matches an\n *                                 include pattern and isn't excluded\n *   - `test.css` unset         → Vitest defaults to `include: []`, so nothing\n *                                 matches and we don't preprocess\n *\n * Used to gate `preprocessCSS` calls in test mode so we don't surface SCSS\n * deprecation noise or pay preprocessing cost the user didn't ask for. (#2297)\n */\nexport function shouldPreprocessTestCss(\n  config: ResolvedConfig | undefined,\n  filePath?: string,\n): boolean {\n  const isTest = process.env['NODE_ENV'] === 'test' || !!process.env['VITEST'];\n  if (!isTest) return true;\n\n  const cssOpt = (\n    config as\n      | (ResolvedConfig & { test?: { css?: VitestCssOption } })\n      | undefined\n  )?.test?.css;\n\n  if (cssOpt === true) return true;\n  if (cssOpt === false || cssOpt == null) return false;\n\n  const toArray = <T>(value: T | T[] | undefined): T[] =>\n    value == null ? [] : Array.isArray(value) ? value : [value];\n  const include = toArray(cssOpt.include);\n  const exclude = toArray(cssOpt.exclude);\n  if (!filePath || include.length === 0) return false;\n\n  const matches = (patterns: CssPattern[]) =>\n    patterns.some((p) =>\n      typeof p === 'string' ? filePath.includes(p) : p.test(filePath),\n    );\n\n  return matches(include) && !matches(exclude);\n}\n\nfunction resolveImportPath(\n  id: string,\n  importer: string | undefined,\n): string | undefined {\n  const filePath = id.split('?')[0];\n  return isAbsolute(filePath)\n    ? normalizePath(filePath)\n    : importer\n      ? normalizePath(resolve(dirname(importer), filePath))\n      : undefined;\n}\n\n/**\n * Rewrite a user `.html?raw` import to a virtual raw id. Returns undefined\n * when the id doesn't match, so callers can fall through to the next check.\n *\n * Routed through a virtual id (rather than `?analog-raw`) so the path Vite\n * sees has no file extension — keeps vite:asset / vite:css from re-tagging\n * the id before our load hook runs.\n */\nexport function rewriteHtmlRawImport(\n  id: string,\n  importer: string | undefined,\n): string | undefined {\n  if (!id.includes('.html?raw')) return undefined;\n  const resolved = resolveImportPath(id, importer);\n  return resolved ? toVirtualRawId(resolved) : undefined;\n}\n\n/**\n * Rewrite a user `.scss?inline` / `.css?inline` / … import to a virtual\n * style id. Returns undefined when the id doesn't match.\n */\nexport function rewriteInlineStyleImport(\n  id: string,\n  importer: string | undefined,\n): string | undefined {\n  if (!INLINE_STYLE_QUERY_RE.test(id)) return undefined;\n  const resolved = resolveImportPath(id, importer);\n  return resolved ? toVirtualStyleId(resolved) : undefined;\n}\n\n/**\n * Load a virtual raw module: reads the backing file, registers it for HMR\n * watching, and returns its content as a default-exported string. Returns\n * undefined when the id is not a virtual raw id.\n */\nexport async function loadVirtualRawModule(\n  ctx: PluginContextLike,\n  id: string,\n): Promise<string | undefined> {\n  if (!isVirtualRawId(id)) return undefined;\n  const filePath = fromVirtualRawId(id);\n  ctx.addWatchFile(filePath);\n  const content = await fsPromises.readFile(filePath, 'utf-8');\n  return `export default ${JSON.stringify(content)}`;\n}\n\n/**\n * Load a virtual style module: reads the backing stylesheet, runs it through\n * Vite's CSS preprocessor, and returns the result as a default-exported\n * string. Returns undefined when the id is not a virtual style id.\n */\nexport async function loadVirtualStyleModule(\n  ctx: PluginContextLike,\n  id: string,\n  resolvedConfig: ResolvedConfig,\n): Promise<string | undefined> {\n  if (!isVirtualStyleId(id)) return undefined;\n  const filePath = fromVirtualStyleId(id);\n  ctx.addWatchFile(filePath);\n  const code = await fsPromises.readFile(filePath, 'utf-8');\n  // In tests, mirror Vitest's `test.css` rules — defaults to no preprocessing\n  // (matches Vite's CSS pipeline behavior under Vitest). (#2297)\n  if (!shouldPreprocessTestCss(resolvedConfig, filePath)) {\n    return `export default ${JSON.stringify(code)}`;\n  }\n  const result = await preprocessCSS(code, filePath, resolvedConfig);\n  return `export default ${JSON.stringify(result.code)}`;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAkDA,SAAgB,wBACd,QACA,UACS;AAET,KAAI,EAAA,QAAA,IAAA,aADuC,UAAU,CAAC,CAAC,QAAQ,IAAI,WACtD,QAAO;CAEpB,MAAM,SACJ,QAGC,MAAM;AAET,KAAI,WAAW,KAAM,QAAO;AAC5B,KAAI,WAAW,SAAS,UAAU,KAAM,QAAO;CAE/C,MAAM,WAAc,UAClB,SAAS,OAAO,EAAE,GAAG,MAAM,QAAQ,MAAM,GAAG,QAAQ,CAAC,MAAM;CAC7D,MAAM,UAAU,QAAQ,OAAO,QAAQ;CACvC,MAAM,UAAU,QAAQ,OAAO,QAAQ;AACvC,KAAI,CAAC,YAAY,QAAQ,WAAW,EAAG,QAAO;CAE9C,MAAM,WAAW,aACf,SAAS,MAAM,MACb,OAAO,MAAM,WAAW,SAAS,SAAS,EAAE,GAAG,EAAE,KAAK,SAAS,CAChE;AAEH,QAAO,QAAQ,QAAQ,IAAI,CAAC,QAAQ,QAAQ;;;;;;;AAkD9C,eAAsB,qBACpB,KACA,IAC6B;AAC7B,KAAI,CAAC,eAAe,GAAG,CAAE,QAAO,KAAA;CAChC,MAAM,WAAW,iBAAiB,GAAG;AACrC,KAAI,aAAa,SAAS;CAC1B,MAAM,UAAU,MAAM,SAAW,SAAS,UAAU,QAAQ;AAC5D,QAAO,kBAAkB,KAAK,UAAU,QAAQ;;;;;;;AAQlD,eAAsB,uBACpB,KACA,IACA,gBAC6B;AAC7B,KAAI,CAAC,iBAAiB,GAAG,CAAE,QAAO,KAAA;CAClC,MAAM,WAAW,mBAAmB,GAAG;AACvC,KAAI,aAAa,SAAS;CAC1B,MAAM,OAAO,MAAM,SAAW,SAAS,UAAU,QAAQ;AAGzD,KAAI,CAAC,wBAAwB,gBAAgB,SAAS,CACpD,QAAO,kBAAkB,KAAK,UAAU,KAAK;CAE/C,MAAM,SAAS,MAAM,cAAc,MAAM,UAAU,eAAe;AAClE,QAAO,kBAAkB,KAAK,UAAU,OAAO,KAAK"}
+{"version":3,"file":"virtual-resources.js","names":[],"sources":["../../../../src/lib/utils/virtual-resources.ts"],"sourcesContent":["// Shared Vite plugin helpers for routing component resources (templates)\n// through virtual module ids. Both angular-vite-plugin and fast-compile-plugin\n// use these so the rewriting + loading behavior stays in sync between them.\n//\n// Style ?inline imports now flow through Vite's native CSS pipeline via\n// safeModulePaths (see safe-module-paths.ts). Only template ?raw imports\n// still use virtual ids.\n\nimport { promises as fsPromises } from 'node:fs';\nimport { dirname, isAbsolute, resolve } from 'node:path';\nimport { normalizePath } from 'vite';\n\nimport {\n  fromVirtualRawId,\n  isVirtualRawId,\n  toVirtualRawId,\n} from './virtual-ids.js';\n\ninterface PluginContextLike {\n  addWatchFile(path: string): void;\n}\n\nfunction resolveImportPath(\n  id: string,\n  importer: string | undefined,\n): string | undefined {\n  const filePath = id.split('?')[0];\n  return isAbsolute(filePath)\n    ? normalizePath(filePath)\n    : importer\n      ? normalizePath(resolve(dirname(importer), filePath))\n      : undefined;\n}\n\n/**\n * Rewrite a user `.html?raw` import to a virtual raw id. Returns undefined\n * when the id doesn't match, so callers can fall through to the next check.\n *\n * Routed through a virtual id (rather than `?analog-raw`) so the path Vite\n * sees has no file extension — keeps vite:asset / vite:css from re-tagging\n * the id before our load hook runs.\n */\nexport function rewriteHtmlRawImport(\n  id: string,\n  importer: string | undefined,\n): string | undefined {\n  if (!id.includes('.html?raw')) return undefined;\n  const resolved = resolveImportPath(id, importer);\n  return resolved ? toVirtualRawId(resolved) : undefined;\n}\n\n/**\n * Load a virtual raw module: reads the backing file, registers it for HMR\n * watching, and returns its content as a default-exported string. Returns\n * undefined when the id is not a virtual raw id.\n */\nexport async function loadVirtualRawModule(\n  ctx: PluginContextLike,\n  id: string,\n): Promise<string | undefined> {\n  if (!isVirtualRawId(id)) return undefined;\n  const filePath = fromVirtualRawId(id);\n  ctx.addWatchFile(filePath);\n  const content = await fsPromises.readFile(filePath, 'utf-8');\n  return `export default ${JSON.stringify(content)}`;\n}\n"],"mappings":";;;;;AAsBA,SAAS,kBACP,IACA,UACoB;CACpB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC;AAC/B,QAAO,WAAW,SAAS,GACvB,cAAc,SAAS,GACvB,WACE,cAAc,QAAQ,QAAQ,SAAS,EAAE,SAAS,CAAC,GACnD,KAAA;;;;;;;;;;AAWR,SAAgB,qBACd,IACA,UACoB;AACpB,KAAI,CAAC,GAAG,SAAS,YAAY,CAAE,QAAO,KAAA;CACtC,MAAM,WAAW,kBAAkB,IAAI,SAAS;AAChD,QAAO,WAAW,eAAe,SAAS,GAAG,KAAA;;;;;;;AAQ/C,eAAsB,qBACpB,KACA,IAC6B;AAC7B,KAAI,CAAC,eAAe,GAAG,CAAE,QAAO,KAAA;CAChC,MAAM,WAAW,iBAAiB,GAAG;AACrC,KAAI,aAAa,SAAS;CAC1B,MAAM,UAAU,MAAM,SAAW,SAAS,UAAU,QAAQ;AAC5D,QAAO,kBAAkB,KAAK,UAAU,QAAQ"}

package/src/lib/virtual-modules-plugin.js

@@ -1,46 +1,19 @@
-import { toVirtualRawId, toVirtualStyleId } from "./utils/virtual-ids.js";
-import { loadVirtualRawModule, loadVirtualStyleModule, shouldPreprocessTestCss } from "./utils/virtual-resources.js";
-import { promises } from "node:fs";
+import { toVirtualRawId } from "./utils/virtual-ids.js";
 import { dirname, isAbsolute, resolve } from "node:path";
-import { normalizePath, preprocessCSS } from "vite";
+import { normalizePath } from "vite";
 //#region packages/vite-plugin-angular/src/lib/virtual-modules-plugin.ts
 function virtualModulesPlugin(pluginOptions) {
-	let resolvedConfig;
 	return {
 		name: "@analogjs/vite-plugin-angular:virtual-modules",
 		enforce: "pre",
-		configResolved(config) {
-			resolvedConfig = config;
-		},
 		resolveId(id, importer) {
-			if (id.startsWith("virtual:@analogjs/vite-plugin-angular:inline-style:") || id.startsWith("virtual:@analogjs/vite-plugin-angular:raw:")) return `\0${id}`;
-			if (pluginOptions.jit && id.startsWith("angular:jit:")) {
-				const filePath = normalizePath(resolve(dirname(importer), id.split(";")[1]));
-				return id.includes(":style") ? toVirtualStyleId(filePath) : toVirtualRawId(filePath);
-			}
+			if (id.startsWith("virtual:@analogjs/vite-plugin-angular:raw:")) return `\0${id}`;
+			if (pluginOptions.jit && id.startsWith("angular:jit:")) return toVirtualRawId(normalizePath(resolve(dirname(importer), id.split(";")[1])));
 			if (id.includes(".html?raw")) {
 				const filePath = id.split("?")[0];
 				const resolved = isAbsolute(filePath) ? normalizePath(filePath) : importer ? normalizePath(resolve(dirname(importer), filePath)) : void 0;
 				if (resolved) return toVirtualRawId(resolved);
 			}
-			if (/\.(css|scss|sass|less)\?inline$/.test(id)) {
-				const filePath = id.split("?")[0];
-				const resolved = isAbsolute(filePath) ? normalizePath(filePath) : importer ? normalizePath(resolve(dirname(importer), filePath)) : void 0;
-				if (resolved) return toVirtualStyleId(resolved);
-			}
-		},
-		async load(id) {
-			const styleModule = await loadVirtualStyleModule(this, id, resolvedConfig);
-			if (styleModule !== void 0) return styleModule;
-			const rawModule = await loadVirtualRawModule(this, id);
-			if (rawModule !== void 0) return rawModule;
-			if (/\.(css|scss|sass|less)\?inline$/.test(id)) {
-				const filePath = id.split("?")[0];
-				const code = await promises.readFile(filePath, "utf-8");
-				if (!shouldPreprocessTestCss(resolvedConfig, filePath)) return `export default ${JSON.stringify(code)}`;
-				const result = await preprocessCSS(code, filePath, resolvedConfig);
-				return `export default ${JSON.stringify(result.code)}`;
-			}
 		}
 	};
 }

package/src/lib/virtual-modules-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"virtual-modules-plugin.js","names":[],"sources":["../../../src/lib/virtual-modules-plugin.ts"],"sourcesContent":["import { promises as fsPromises } from 'node:fs';\nimport { dirname, isAbsolute, resolve } from 'node:path';\nimport { normalizePath, Plugin, preprocessCSS, ResolvedConfig } from 'vite';\nimport {\n  VIRTUAL_RAW_PREFIX,\n  VIRTUAL_STYLE_PREFIX,\n  toVirtualRawId,\n  toVirtualStyleId,\n} from './utils/virtual-ids.js';\nimport {\n  loadVirtualRawModule,\n  loadVirtualStyleModule,\n  shouldPreprocessTestCss,\n} from './utils/virtual-resources.js';\n\nexport interface VirtualModulesPluginOptions {\n  jit: boolean;\n}\n\nexport function virtualModulesPlugin(\n  pluginOptions: VirtualModulesPluginOptions,\n): Plugin {\n  let resolvedConfig: ResolvedConfig;\n\n  return {\n    name: '@analogjs/vite-plugin-angular:virtual-modules',\n    enforce: 'pre',\n    configResolved(config) {\n      resolvedConfig = config;\n    },\n    resolveId(id, importer) {\n      if (\n        id.startsWith(VIRTUAL_STYLE_PREFIX) ||\n        id.startsWith(VIRTUAL_RAW_PREFIX)\n      ) {\n        return `\\0${id}`;\n      }\n\n      if (pluginOptions.jit && id.startsWith('angular:jit:')) {\n        const filePath = normalizePath(\n          resolve(dirname(importer as string), id.split(';')[1]),\n        );\n        return id.includes(':style')\n          ? toVirtualStyleId(filePath)\n          : toVirtualRawId(filePath);\n      }\n\n      // Intercept .html?raw imports to bypass Vite server.fs restrictions\n      if (id.includes('.html?raw')) {\n        const filePath = id.split('?')[0];\n        const resolved = isAbsolute(filePath)\n          ? normalizePath(filePath)\n          : importer\n            ? normalizePath(resolve(dirname(importer), filePath))\n            : undefined;\n        if (resolved) {\n          return toVirtualRawId(resolved);\n        }\n      }\n\n      // Intercept style ?inline imports to bypass Vite server.fs restrictions\n      if (/\\.(css|scss|sass|less)\\?inline$/.test(id)) {\n        const filePath = id.split('?')[0];\n        const resolved = isAbsolute(filePath)\n          ? normalizePath(filePath)\n          : importer\n            ? normalizePath(resolve(dirname(importer), filePath))\n            : undefined;\n        if (resolved) {\n          return toVirtualStyleId(resolved);\n        }\n      }\n\n      return undefined;\n    },\n    async load(id) {\n      const styleModule = await loadVirtualStyleModule(\n        this,\n        id,\n        resolvedConfig,\n      );\n      if (styleModule !== undefined) return styleModule;\n\n      const rawModule = await loadVirtualRawModule(this, id);\n      if (rawModule !== undefined) return rawModule;\n\n      // Vitest fallback: the module-runner calls ensureEntryFromUrl before\n      // transformRequest, which skips pluginContainer.resolveId entirely,\n      // so a user `import foo from './a.scss?inline'` reaches load as the\n      // bare query form. Handle it here so tests still resolve.\n      if (/\\.(css|scss|sass|less)\\?inline$/.test(id)) {\n        const filePath = id.split('?')[0];\n        const code = await fsPromises.readFile(filePath, 'utf-8');\n        if (!shouldPreprocessTestCss(resolvedConfig, filePath)) {\n          return `export default ${JSON.stringify(code)}`;\n        }\n        const result = await preprocessCSS(code, filePath, resolvedConfig);\n        return `export default ${JSON.stringify(result.code)}`;\n      }\n\n      return;\n    },\n  };\n}\n"],"mappings":";;;;;;AAmBA,SAAgB,qBACd,eACQ;CACR,IAAI;AAEJ,QAAO;EACL,MAAM;EACN,SAAS;EACT,eAAe,QAAQ;AACrB,oBAAiB;;EAEnB,UAAU,IAAI,UAAU;AACtB,OACE,GAAG,WAAA,sDAAgC,IACnC,GAAG,WAAA,6CAA8B,CAEjC,QAAO,KAAK;AAGd,OAAI,cAAc,OAAO,GAAG,WAAW,eAAe,EAAE;IACtD,MAAM,WAAW,cACf,QAAQ,QAAQ,SAAmB,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CACvD;AACD,WAAO,GAAG,SAAS,SAAS,GACxB,iBAAiB,SAAS,GAC1B,eAAe,SAAS;;AAI9B,OAAI,GAAG,SAAS,YAAY,EAAE;IAC5B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC;IAC/B,MAAM,WAAW,WAAW,SAAS,GACjC,cAAc,SAAS,GACvB,WACE,cAAc,QAAQ,QAAQ,SAAS,EAAE,SAAS,CAAC,GACnD,KAAA;AACN,QAAI,SACF,QAAO,eAAe,SAAS;;AAKnC,OAAI,kCAAkC,KAAK,GAAG,EAAE;IAC9C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC;IAC/B,MAAM,WAAW,WAAW,SAAS,GACjC,cAAc,SAAS,GACvB,WACE,cAAc,QAAQ,QAAQ,SAAS,EAAE,SAAS,CAAC,GACnD,KAAA;AACN,QAAI,SACF,QAAO,iBAAiB,SAAS;;;EAMvC,MAAM,KAAK,IAAI;GACb,MAAM,cAAc,MAAM,uBACxB,MACA,IACA,eACD;AACD,OAAI,gBAAgB,KAAA,EAAW,QAAO;GAEtC,MAAM,YAAY,MAAM,qBAAqB,MAAM,GAAG;AACtD,OAAI,cAAc,KAAA,EAAW,QAAO;AAMpC,OAAI,kCAAkC,KAAK,GAAG,EAAE;IAC9C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC;IAC/B,MAAM,OAAO,MAAM,SAAW,SAAS,UAAU,QAAQ;AACzD,QAAI,CAAC,wBAAwB,gBAAgB,SAAS,CACpD,QAAO,kBAAkB,KAAK,UAAU,KAAK;IAE/C,MAAM,SAAS,MAAM,cAAc,MAAM,UAAU,eAAe;AAClE,WAAO,kBAAkB,KAAK,UAAU,OAAO,KAAK;;;EAKzD"}
+{"version":3,"file":"virtual-modules-plugin.js","names":[],"sources":["../../../src/lib/virtual-modules-plugin.ts"],"sourcesContent":["import { dirname, isAbsolute, resolve } from 'node:path';\nimport { normalizePath, Plugin } from 'vite';\nimport { VIRTUAL_RAW_PREFIX, toVirtualRawId } from './utils/virtual-ids.js';\n\nexport interface VirtualModulesPluginOptions {\n  jit: boolean;\n}\n\nexport function virtualModulesPlugin(\n  pluginOptions: VirtualModulesPluginOptions,\n): Plugin {\n  return {\n    name: '@analogjs/vite-plugin-angular:virtual-modules',\n    enforce: 'pre',\n    resolveId(id, importer) {\n      if (id.startsWith(VIRTUAL_RAW_PREFIX)) {\n        return `\\0${id}`;\n      }\n\n      if (pluginOptions.jit && id.startsWith('angular:jit:')) {\n        const filePath = normalizePath(\n          resolve(dirname(importer as string), id.split(';')[1]),\n        );\n        return toVirtualRawId(filePath);\n      }\n\n      // Intercept .html?raw imports to bypass Vite server.fs restrictions\n      if (id.includes('.html?raw')) {\n        const filePath = id.split('?')[0];\n        const resolved = isAbsolute(filePath)\n          ? normalizePath(filePath)\n          : importer\n            ? normalizePath(resolve(dirname(importer), filePath))\n            : undefined;\n        if (resolved) {\n          return toVirtualRawId(resolved);\n        }\n      }\n\n      return undefined;\n    },\n  };\n}\n"],"mappings":";;;;AAQA,SAAgB,qBACd,eACQ;AACR,QAAO;EACL,MAAM;EACN,SAAS;EACT,UAAU,IAAI,UAAU;AACtB,OAAI,GAAG,WAAA,6CAA8B,CACnC,QAAO,KAAK;AAGd,OAAI,cAAc,OAAO,GAAG,WAAW,eAAe,CAIpD,QAAO,eAHU,cACf,QAAQ,QAAQ,SAAmB,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CACvD,CAC8B;AAIjC,OAAI,GAAG,SAAS,YAAY,EAAE;IAC5B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC;IAC/B,MAAM,WAAW,WAAW,SAAS,GACjC,cAAc,SAAS,GACvB,WACE,cAAc,QAAQ,QAAQ,SAAS,EAAE,SAAS,CAAC,GACnD,KAAA;AACN,QAAI,SACF,QAAO,eAAe,SAAS;;;EAMtC"}