@mayson-org/inject-script 1.0.6 → 1.0.8

package/README.md

@@ -29,7 +29,7 @@ The pill:
 
 - Fixed bottom-right “Edit with Mayson” (logo + label)
 - Dismiss (×) hides it for the session
-- Click opens the Mayson remix URL (baked at inject time)
+- Click navigates to https://mayson.dev/ (hardcoded for now)
 
 ### API gating (`show_remix_pill` / `enable_remix`)
 
@@ -41,9 +41,9 @@ Header: `M-Web-Token: {MAYSON_WEB_TOKEN}`
 | API field | Effect |
 |-----------|--------|
 | `show_remix_pill` | If `false`, watermark is **not** injected; if `true`, inject |
-| `enable_remix` | Baked into the component remix URL (`true` → collection remix redirect; otherwise app home) |
+| `enable_remix` | Still fetched for later use; click target is hardcoded to https://mayson.dev/ for now |
 
-**Metadata not found (404):** if the API returns HTTP 404 or a body like `{ "response_code": 404, "message": "Generated app metadata not found", "value": {} }`, treat as **`show_remix_pill=true`** and **`enable_remix=true`** (show watermark, remixable).
+**Metadata not found (404):** if the API returns HTTP 404 or a body like `{ "response_code": 404, "message": "Generated app metadata not found", "value": {} }`, treat as **`show_remix_pill=true`** and **`enable_remix=true`** (show watermark).
 
 Defaults when the API is not called or fails for other reasons: `showRemixPill=false`, `enableRemix=false` (watermark skipped).
 

package/dist/core/remove-component.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Remove a previously injected Mayson component from the root layout
+ * (import, JSX tag, and injection comment).
+ */
+export declare function removeComponentFromLayout(filePath: string, componentName: string, dryRun?: boolean): boolean;
+/** Delete generated component file next to the layout (e.g. MaysonWatermark.tsx). */
+export declare function deleteGeneratedComponentFile(layoutPath: string, componentName: string, dryRun?: boolean): boolean;
+//# sourceMappingURL=remove-component.d.ts.map

package/dist/core/remove-component.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove-component.d.ts","sourceRoot":"","sources":["../../src/core/remove-component.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,MAAM,UAAQ,GACb,OAAO,CAiCT;AAED,qFAAqF;AACrF,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,MAAM,UAAQ,GACb,OAAO,CAkBT"}

package/dist/core/remove-component.js

@@ -0,0 +1,44 @@
+import fs from 'node:fs';
+import path from 'node:path';
+/**
+ * Remove a previously injected Mayson component from the root layout
+ * (import, JSX tag, and injection comment).
+ */
+export function removeComponentFromLayout(filePath, componentName, dryRun = false) {
+    if (!fs.existsSync(filePath)) {
+        return false;
+    }
+    const before = fs.readFileSync(filePath, 'utf-8');
+    let content = before;
+    content = content.replace(new RegExp(`^import\\s*\\{\\s*${componentName}\\s*\\}\\s*from\\s*['"][^'"]+['"];?\\s*\\n?`, 'gm'), '');
+    content = content.replace(new RegExp(`\\n?\\s*\\{/\\*\\s*@mayson-component-injected:\\s*${componentName}\\s*\\*/\\}\\s*\\n?\\s*<${componentName}\\s*/>\\s*`, 'g'), '\n');
+    // Fallback if comment was removed but tag remains
+    content = content.replace(new RegExp(`\\n?\\s*<${componentName}\\s*/>\\s*`, 'g'), '\n');
+    if (content === before) {
+        return false;
+    }
+    if (!dryRun) {
+        fs.writeFileSync(filePath, content, 'utf-8');
+    }
+    return true;
+}
+/** Delete generated component file next to the layout (e.g. MaysonWatermark.tsx). */
+export function deleteGeneratedComponentFile(layoutPath, componentName, dryRun = false) {
+    const dir = path.dirname(layoutPath);
+    const candidates = [
+        path.join(dir, `${componentName}.tsx`),
+        path.join(dir, `${componentName}.jsx`),
+        path.join(dir, `${componentName}.ts`),
+        path.join(dir, `${componentName}.js`),
+    ];
+    let deleted = false;
+    for (const filePath of candidates) {
+        if (!fs.existsSync(filePath))
+            continue;
+        if (!dryRun) {
+            fs.unlinkSync(filePath);
+        }
+        deleted = true;
+    }
+    return deleted;
+}

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import type { ComponentType, InjectorResult } from './core/types.js';
 export { findRootLayout } from './core/find-root-layout.js';
 export { generateComponents } from './core/generators.js';
 export { injectComponentsIntoLayout } from './core/injector.js';
+export { deleteGeneratedComponentFile, removeComponentFromLayout, } from './core/remove-component.js';
 export { buildRemixRedirectUrl, BADGE_UTM_SOURCE } from './shared/remix-url.js';
 export type { RemixUrlConfig } from './shared/remix-url.js';
 export { loadMaysonEnvConfig } from './shared/config.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EAEf,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAChF,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,+BAA+B,GAChC,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,eAAe,EACf,0BAA0B,GAC3B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,WAAW,EACX,sBAAsB,GACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,aAAa,EACb,sBAAsB,EACtB,yBAAyB,EACzB,eAAe,EACf,cAAc,EACd,YAAY,EACZ,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAwBzB;;;GAGG;AACH,wBAAsB,aAAa,CACjC,WAAW,GAAE,MAAsB,EACnC,KAAK,GAAE,aAAa,EAA2B,EAC/C,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,cAAc,CAAC,CA0DzB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EAEf,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EACL,4BAA4B,EAC5B,yBAAyB,GAC1B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAChF,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,+BAA+B,GAChC,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,eAAe,EACf,0BAA0B,GAC3B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,WAAW,EACX,sBAAsB,GACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,aAAa,EACb,sBAAsB,EACtB,yBAAyB,EACzB,eAAe,EACf,cAAc,EACd,YAAY,EACZ,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAiDzB;;;GAGG;AACH,wBAAsB,aAAa,CACjC,WAAW,GAAE,MAAsB,EACnC,KAAK,GAAE,aAAa,EAA2B,EAC/C,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,cAAc,CAAC,CAkEzB"}

package/dist/index.js

@@ -2,10 +2,12 @@ import path from 'node:path';
 import { findRootLayout } from './core/find-root-layout.js';
 import { generateComponents } from './core/generators.js';
 import { injectComponentsIntoLayout } from './core/injector.js';
+import { deleteGeneratedComponentFile, removeComponentFromLayout, } from './core/remove-component.js';
 import { resolveMaysonConfig } from './shared/generated-app-metadata.js';
 export { findRootLayout } from './core/find-root-layout.js';
 export { generateComponents } from './core/generators.js';
 export { injectComponentsIntoLayout } from './core/injector.js';
+export { deleteGeneratedComponentFile, removeComponentFromLayout, } from './core/remove-component.js';
 export { buildRemixRedirectUrl, BADGE_UTM_SOURCE } from './shared/remix-url.js';
 export { loadMaysonEnvConfig } from './shared/config.js';
 export { fetchGeneratedAppMetadata, resolveMaysonConfig, shouldFetchGeneratedAppMetadata, } from './shared/generated-app-metadata.js';
@@ -18,13 +20,23 @@ function filterTypesForConfig(types, showRemixPill) {
         ? ['watermark', 'ascii', 'metadata']
         : types;
     if (selected.includes('watermark') && !showRemixPill) {
-        messages.push('watermark skipped — show_remix_pill is false (set via generated-app-metadata API)');
+        messages.push('watermark disabled — show_remix_pill is false (removing pill if present)');
         return {
             types: selected.filter((t) => t !== 'watermark'),
             messages,
+            removeWatermark: true,
         };
     }
-    return { types: selected, messages };
+    return { types: selected, messages, removeWatermark: false };
+}
+function stripWatermark(layoutPath, dryRun, messages) {
+    const removedFromLayout = removeComponentFromLayout(layoutPath, 'MaysonWatermark', dryRun);
+    const deletedFile = deleteGeneratedComponentFile(layoutPath, 'MaysonWatermark', dryRun);
+    if (removedFromLayout || deletedFile) {
+        messages.push(dryRun
+            ? 'would remove MaysonWatermark from layout / disk'
+            : 'removed MaysonWatermark from layout / disk');
+    }
 }
 /**
  * Auto-detect root layout, fetch watermark flags from generated-app-metadata when
@@ -42,7 +54,11 @@ export async function runAutoInject(projectRoot = process.cwd(), types = ['water
         };
     }
     const config = await resolveMaysonConfig();
-    const { types: effectiveTypes, messages } = filterTypesForConfig(types, config.showRemixPill);
+    console.log(`[mayson] resolved show_remix_pill=${config.showRemixPill} enable_remix=${config.enableRemix}`);
+    const { types: effectiveTypes, messages, removeWatermark } = filterTypesForConfig(types, config.showRemixPill);
+    if (removeWatermark) {
+        stripWatermark(layoutPath, dryRun, messages);
+    }
     if (effectiveTypes.length === 0) {
         return {
             success: true,

package/dist/plugins/watermark/template.d.ts

@@ -1,9 +1,4 @@
 import type { PluginGenerateContext } from '../../core/types.js';
-export type WatermarkTemplateOptions = {
-    enableRemix: boolean;
-    appBaseUrl: string;
-    collectionId: string;
-};
 /** Source for the consumer-app MaysonWatermark client component. */
-export declare function buildMaysonWatermarkSource(context?: PluginGenerateContext): string;
+export declare function buildMaysonWatermarkSource(_context?: PluginGenerateContext): string;
 //# sourceMappingURL=template.d.ts.map

package/dist/plugins/watermark/template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../../src/plugins/watermark/template.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAIjE,MAAM,MAAM,wBAAwB,GAAG;IACrC,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAaF,oEAAoE;AACpE,wBAAgB,0BAA0B,CACxC,OAAO,CAAC,EAAE,qBAAqB,GAC9B,MAAM,CAqHR"}
+{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../../src/plugins/watermark/template.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAKjE,oEAAoE;AACpE,wBAAgB,0BAA0B,CACxC,QAAQ,CAAC,EAAE,qBAAqB,GAC/B,MAAM,CA8GR"}

package/dist/plugins/watermark/template.js

@@ -1,27 +1,13 @@
-import { buildRemixRedirectUrl } from '../../shared/remix-url.js';
 const LOGO_URL = 'https://mayson.dev/logo/brand-logo-dark.png';
-function resolveWatermarkOptions(context) {
-    const wm = context?.watermark;
-    return {
-        enableRemix: wm?.enableRemix ?? false,
-        appBaseUrl: wm?.appBaseUrl || 'https://mayson.dev',
-        collectionId: wm?.collectionId || '',
-    };
-}
+const MAYSON_HOME_URL = 'https://mayson.dev/';
 /** Source for the consumer-app MaysonWatermark client component. */
-export function buildMaysonWatermarkSource(context) {
-    const options = resolveWatermarkOptions(context);
-    const remixUrl = buildRemixRedirectUrl({
-        appBaseUrl: options.appBaseUrl,
-        collectionId: options.collectionId,
-        enableRemix: options.enableRemix,
-    });
+export function buildMaysonWatermarkSource(_context) {
     return `'use client';
 
 import React, { useState } from 'react';
 
 const LOGO_URL = ${JSON.stringify(LOGO_URL)};
-const REMIX_URL = ${JSON.stringify(remixUrl)};
+const REMIX_URL = ${JSON.stringify(MAYSON_HOME_URL)};
 
 export function MaysonWatermark() {
   const [dismissed, setDismissed] = useState(false);
@@ -33,7 +19,7 @@ export function MaysonWatermark() {
   const handleRemix = (event: React.MouseEvent) => {
     event.preventDefault();
     event.stopPropagation();
-    window.location.href = "https://mayson.dev/";
+    window.location.href = REMIX_URL;
   };
 
   const handleDismiss = (event: React.MouseEvent) => {

package/dist/shared/generated-app-metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generated-app-metadata.d.ts","sourceRoot":"","sources":["../../src/shared/generated-app-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGnD,MAAM,MAAM,yBAAyB,GAAG;IACtC,eAAe,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACjC,YAAY,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,yBAAyB,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,2EAA2E;AAC3E,eAAO,MAAM,2BAA2B,EAAE,IAAI,CAC5C,eAAe,EACf,eAAe,GAAG,aAAa,CAIhC,CAAC;AAEF,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,YAAY,GAAG,aAAa,GAAG,cAAc,CAAC,GAC3E,MAAM,GAAG,IAAI,CASf;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,eAAe,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAGT;AAED,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,yBAAyB,GAC/B,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,eAAe,GAAG,aAAa,CAAC,CAAC,CAWjE;AAED,6EAA6E;AAC7E,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,4BAA4B,GAAG,IAAI,GAAG,SAAS,GACpD,OAAO,CAiBT;AAYD,6FAA6F;AAC7F,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,eAAe,EACvB,OAAO,GAAE,gCAAqC,GAC7C,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,eAAe,GAAG,aAAa,CAAC,CAAC,GAAG,IAAI,CAAC,CAiDjF;AAED,oFAAoF;AACpF,wBAAsB,mBAAmB,CACvC,OAAO,GAAE,gCAAqC,GAC7C,OAAO,CAAC,eAAe,CAAC,CAa1B"}
+{"version":3,"file":"generated-app-metadata.d.ts","sourceRoot":"","sources":["../../src/shared/generated-app-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGnD,MAAM,MAAM,yBAAyB,GAAG;IACtC,eAAe,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACjC,YAAY,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,yBAAyB,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,2EAA2E;AAC3E,eAAO,MAAM,2BAA2B,EAAE,IAAI,CAC5C,eAAe,EACf,eAAe,GAAG,aAAa,CAIhC,CAAC;AAEF,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,YAAY,GAAG,aAAa,GAAG,cAAc,CAAC,GAC3E,MAAM,GAAG,IAAI,CASf;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,eAAe,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAGT;AAED,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,yBAAyB,GAC/B,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,eAAe,GAAG,aAAa,CAAC,CAAC,CAajE;AAeD,6EAA6E;AAC7E,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,4BAA4B,GAAG,IAAI,GAAG,SAAS,GACpD,OAAO,CAiBT;AAYD,6FAA6F;AAC7F,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,eAAe,EACvB,OAAO,GAAE,gCAAqC,GAC7C,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,eAAe,GAAG,aAAa,CAAC,CAAC,GAAG,IAAI,CAAC,CAqDjF;AAED,oFAAoF;AACpF,wBAAsB,mBAAmB,CACvC,OAAO,GAAE,gCAAqC,GAC7C,OAAO,CAAC,eAAe,CAAC,CAa1B"}

package/dist/shared/generated-app-metadata.js

@@ -19,14 +19,28 @@ export function shouldFetchGeneratedAppMetadata(config, webToken) {
 }
 export function mapGeneratedAppMetadataValue(value) {
     const partial = {};
-    if (value.show_remix_pill !== null && value.show_remix_pill !== undefined) {
-        partial.showRemixPill = value.show_remix_pill;
+    const show = coerceBoolean(value.show_remix_pill);
+    if (show !== undefined) {
+        partial.showRemixPill = show;
     }
-    if (value.enable_remix !== null && value.enable_remix !== undefined) {
-        partial.enableRemix = value.enable_remix;
+    const remix = coerceBoolean(value.enable_remix);
+    if (remix !== undefined) {
+        partial.enableRemix = remix;
     }
     return partial;
 }
+function coerceBoolean(value) {
+    if (typeof value === 'boolean') {
+        return value;
+    }
+    if (value === 'true' || value === 1 || value === '1') {
+        return true;
+    }
+    if (value === 'false' || value === 0 || value === '0') {
+        return false;
+    }
+    return undefined;
+}
 /** True when API indicates no metadata row exists yet (HTTP or body 404). */
 export function isGeneratedAppMetadataNotFound(httpStatus, data) {
     if (httpStatus === 404) {
@@ -82,7 +96,9 @@ export async function fetchGeneratedAppMetadata(config, options = {}) {
             console.warn('[mayson] generated-app-metadata response invalid — using local config');
             return null;
         }
-        return mapGeneratedAppMetadataValue(data.value);
+        const mapped = mapGeneratedAppMetadataValue(data.value);
+        console.log(`[mayson] generated-app-metadata ok — show_remix_pill=${String(mapped.showRemixPill)} enable_remix=${String(mapped.enableRemix)}`);
+        return mapped;
     }
     catch (err) {
         console.warn(`[mayson] generated-app-metadata fetch failed: ${err.message} — using local config`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mayson-org/inject-script",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "CLI and library to inject Mayson watermark and ascii into Next.js App Router layouts.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",