@markw65/monkeyc-optimizer 1.1.37 → 1.1.38

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.38
+
+- Fix a bug introduced in 1.1.37 that could lead to duplicate diagnostics, and diagnostics with strange contents.
+- Give `{ :foo => null }` the type `{ :foo => Object? }`, so that subsequent assignments to `:foo` aren't reported as type errors.
+
 ### 1.1.37
 
 - Update to [@markw65/prettier-plugin-monkeyc@1.0.53](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1053)

package/build/api.cjs

@@ -18,45 +18,47 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_E67DP34P.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_E67DP34P.collectNamespaces,
-  createDocumentationMap: () => import_chunk_E67DP34P.createDocumentationMap,
-  diagnostic: () => import_chunk_E67DP34P.diagnostic,
-  diagnosticHelper: () => import_chunk_E67DP34P.diagnosticHelper,
-  findNamesInScope: () => import_chunk_E67DP34P.findNamesInScope,
-  findUsingForNode: () => import_chunk_E67DP34P.findUsingForNode,
-  formatAst: () => import_chunk_E67DP34P.formatAst,
-  formatAstLongLines: () => import_chunk_E67DP34P.formatAstLongLines,
-  formatScopedName: () => import_chunk_E67DP34P.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_E67DP34P.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_E67DP34P.getApiMapping,
-  getSuperClasses: () => import_chunk_E67DP34P.getSuperClasses,
+  checkCompilerVersion: () => import_chunk_IMIM4BE2.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_IMIM4BE2.collectNamespaces,
+  createDocumentationMap: () => import_chunk_IMIM4BE2.createDocumentationMap,
+  diagnostic: () => import_chunk_IMIM4BE2.diagnostic,
+  diagnosticHelper: () => import_chunk_IMIM4BE2.diagnosticHelper,
+  findNamesInScope: () => import_chunk_IMIM4BE2.findNamesInScope,
+  findUsingForNode: () => import_chunk_IMIM4BE2.findUsingForNode,
+  formatAst: () => import_chunk_IMIM4BE2.formatAst,
+  formatAstLongLines: () => import_chunk_IMIM4BE2.formatAstLongLines,
+  formatScopedName: () => import_chunk_IMIM4BE2.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_IMIM4BE2.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_IMIM4BE2.getApiMapping,
+  getSuperClasses: () => import_chunk_IMIM4BE2.getSuperClasses,
   hasProperty: () => import_chunk_MBTLUWXR.hasProperty,
-  isClassVariable: () => import_chunk_E67DP34P.isClassVariable,
-  isLocal: () => import_chunk_E67DP34P.isLocal,
-  isLookupCandidate: () => import_chunk_E67DP34P.isLookupCandidate,
-  isStateNode: () => import_chunk_E67DP34P.isStateNode,
-  lookupByFullName: () => import_chunk_E67DP34P.lookupByFullName,
-  lookupNext: () => import_chunk_E67DP34P.lookupNext,
-  lookupResultContains: () => import_chunk_E67DP34P.lookupResultContains,
-  lookupWithType: () => import_chunk_E67DP34P.lookupWithType,
-  makeToyboxLink: () => import_chunk_E67DP34P.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_E67DP34P.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_E67DP34P.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_E67DP34P.parseSdkVersion,
-  sameLookupResult: () => import_chunk_E67DP34P.sameLookupResult,
+  isClassVariable: () => import_chunk_IMIM4BE2.isClassVariable,
+  isLocal: () => import_chunk_IMIM4BE2.isLocal,
+  isLookupCandidate: () => import_chunk_IMIM4BE2.isLookupCandidate,
+  isStateNode: () => import_chunk_IMIM4BE2.isStateNode,
+  lookupByFullName: () => import_chunk_IMIM4BE2.lookupByFullName,
+  lookupNext: () => import_chunk_IMIM4BE2.lookupNext,
+  lookupResultContains: () => import_chunk_IMIM4BE2.lookupResultContains,
+  lookupWithType: () => import_chunk_IMIM4BE2.lookupWithType,
+  makeToyboxLink: () => import_chunk_IMIM4BE2.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_IMIM4BE2.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_IMIM4BE2.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_IMIM4BE2.parseSdkVersion,
+  resolveDiagnostics: () => import_chunk_IMIM4BE2.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_IMIM4BE2.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_IMIM4BE2.sameLookupResult,
   traverseAst: () => import_chunk_MBTLUWXR.traverseAst,
-  variableDeclarationName: () => import_chunk_E67DP34P.variableDeclarationName,
-  visitReferences: () => import_chunk_E67DP34P.visitReferences,
-  visit_resources: () => import_chunk_E67DP34P.visit_resources,
-  visitorNode: () => import_chunk_E67DP34P.visitorNode
+  variableDeclarationName: () => import_chunk_IMIM4BE2.variableDeclarationName,
+  visitReferences: () => import_chunk_IMIM4BE2.visitReferences,
+  visit_resources: () => import_chunk_IMIM4BE2.visit_resources,
+  visitorNode: () => import_chunk_IMIM4BE2.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_E67DP34P = require("./chunk-E67DP34P.cjs");
+var import_chunk_IMIM4BE2 = require("./chunk-IMIM4BE2.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_E67DP34P.init_api)();
+(0, import_chunk_IMIM4BE2.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,
@@ -85,6 +87,8 @@ var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
   mapVarDeclsByType,
   markInvokeClassMethod,
   parseSdkVersion,
+  resolveDiagnostics,
+  resolveDiagnosticsMap,
   sameLookupResult,
   traverseAst,
   variableDeclarationName,

package/build/{chunk-E67DP34P.cjs → chunk-IMIM4BE2.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_E67DP34P_exports = {};
-__export(chunk_E67DP34P_exports, {
+var chunk_IMIM4BE2_exports = {};
+__export(chunk_IMIM4BE2_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -113,6 +113,8 @@ __export(chunk_E67DP34P_exports, {
   performTask: () => performTask,
   readPrg: () => readPrg,
   readPrgWithOffsets: () => readPrgWithOffsets,
+  resolveDiagnostics: () => resolveDiagnostics,
+  resolveDiagnosticsMap: () => resolveDiagnosticsMap,
   restrictByEquality: () => restrictByEquality,
   runTaskInPool: () => runTaskInPool,
   sameLookupResult: () => sameLookupResult,
@@ -128,7 +130,7 @@ __export(chunk_E67DP34P_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_E67DP34P_exports);
+module.exports = __toCommonJS(chunk_IMIM4BE2_exports);
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -10778,6 +10780,12 @@ function cloneType(t) {
   return { ...t };
 }
 function relaxType(type) {
+  if (type.type === 1) {
+    return {
+      type: 1 | 32768
+      /* Object */
+    };
+  }
   const valTypes = type.type & ValueTypeTagsConst;
   if ((!valTypes || hasNoData(type, valTypes)) && (!(type.type & 6) || (type.type & 6) === 6)) {
     return type;
@@ -16796,40 +16804,6 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
     }
     delete state.inlineDiagnostics;
   }
-  const resolveDiagnostics = (diagnostics2) => diagnostics2 ? Promise.all(
-    diagnostics2?.filter((diagnostic2) => typeof diagnostic2.message !== "string").map((diagnostic2) => diagnostic2.message)
-  ).then(() => {
-    const groups = /* @__PURE__ */ new Map();
-    diagnostics2.forEach((d) => {
-      let key = `${d.loc.start.offset}:${d.loc.end.offset}`;
-      if (d.related) {
-        key += ":" + d.related.map((r) => `${r.loc.start.offset}:${r.loc.end.offset}`).join(":");
-      }
-      if (!d.message) {
-        groups.delete(key);
-      } else {
-        const group = groups.get(key);
-        if (!group) {
-          groups.set(key, [d]);
-        } else {
-          const index = group.findIndex((g) => g.message === d.message);
-          if (index < 0) {
-            group.push(d);
-          } else {
-            group[index] = d;
-          }
-        }
-      }
-    });
-    diagnostics2.splice(0);
-    diagnostics2.push(...Array.from(groups.values()).flat());
-    return diagnostics2;
-  }) : diagnostics2;
-  const resolveDiagnosticsMap = (diagnosticsMap) => Promise.all(
-    Object.values(diagnosticsMap).map(
-      (diagnostics2) => resolveDiagnostics(diagnostics2)
-    )
-  ).then(() => diagnosticsMap);
   if (state.config?.checkBuildPragmas) {
     await Object.entries(fnMap).reduce((promise, [name, f]) => {
       return Promise.all([
@@ -18903,6 +18877,44 @@ function isLocal(v) {
 function isClassVariable(v) {
   return v.stack[v.stack.length - 1]?.sn.type === "ClassDeclaration";
 }
+function resolveDiagnostics(diagnostics) {
+  return diagnostics ? Promise.all(
+    diagnostics?.filter((diagnostic2) => typeof diagnostic2.message !== "string").map((diagnostic2) => diagnostic2.message)
+  ).then(() => {
+    const groups = /* @__PURE__ */ new Map();
+    diagnostics.forEach((d) => {
+      let key = `${d.loc.start.offset}:${d.loc.end.offset}`;
+      if (d.related) {
+        key += ":" + d.related.map((r) => `${r.loc.start.offset}:${r.loc.end.offset}`).join(":");
+      }
+      if (!d.message) {
+        groups.delete(key);
+      } else {
+        const group = groups.get(key);
+        if (!group) {
+          groups.set(key, [d]);
+        } else {
+          const index = group.findIndex((g) => g.message === d.message);
+          if (index < 0) {
+            group.push(d);
+          } else {
+            group[index] = d;
+          }
+        }
+      }
+    });
+    diagnostics.splice(0);
+    diagnostics.push(...Array.from(groups.values()).flat());
+    return diagnostics;
+  }) : diagnostics;
+}
+function resolveDiagnosticsMap(diagnosticsMap) {
+  return Promise.all(
+    Object.values(diagnosticsMap).map(
+      (diagnostics) => resolveDiagnostics(diagnostics)
+    )
+  ).then(() => diagnosticsMap);
+}
 function diagnostic(state, node, message, type = "INFO", extra) {
   if (!state.diagnostics)
     state.diagnostics = {};
@@ -28081,7 +28093,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_SG7ODKRM.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1695852724811 < opt_time) {
+      if (source_time < opt_time && 1695857383506 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -28120,7 +28132,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.37",
+            optimizerVersion: "1.1.38",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -28261,6 +28273,9 @@ async function getProjectAnalysisHelper(targets, analysis, manifestXML, options)
     });
     delete state.pre;
   }
+  if (state.diagnostics) {
+    await resolveDiagnosticsMap(state.diagnostics);
+  }
   return { fnMap, paths, state, typeMap };
 }
 var defaultConfig, configOptionsToCheck;
@@ -29031,6 +29046,8 @@ var init_sdk_util = (0, import_chunk_ABYVSU2C.__esm)({
   performTask,
   readPrg,
   readPrgWithOffsets,
+  resolveDiagnostics,
+  resolveDiagnosticsMap,
   restrictByEquality,
   runTaskInPool,
   sameLookupResult,

package/build/optimizer.cjs

@@ -18,28 +18,28 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_E67DP34P.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_E67DP34P.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_IMIM4BE2.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_IMIM4BE2.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_SG7ODKRM.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_E67DP34P.defaultConfig,
-  display: () => import_chunk_E67DP34P.display,
-  generateOneConfig: () => import_chunk_E67DP34P.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_E67DP34P.generateOptimizedProject,
-  getConfig: () => import_chunk_E67DP34P.getConfig,
-  getProjectAnalysis: () => import_chunk_E67DP34P.getProjectAnalysis,
-  get_jungle: () => import_chunk_E67DP34P.get_jungle,
-  isErrorWithLocation: () => import_chunk_E67DP34P.isErrorWithLocation,
-  launchSimulator: () => import_chunk_E67DP34P.launchSimulator,
-  manifestProducts: () => import_chunk_E67DP34P.manifestProducts,
-  mctree: () => import_chunk_E67DP34P.mctree,
-  simulateProgram: () => import_chunk_E67DP34P.simulateProgram
+  defaultConfig: () => import_chunk_IMIM4BE2.defaultConfig,
+  display: () => import_chunk_IMIM4BE2.display,
+  generateOneConfig: () => import_chunk_IMIM4BE2.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_IMIM4BE2.generateOptimizedProject,
+  getConfig: () => import_chunk_IMIM4BE2.getConfig,
+  getProjectAnalysis: () => import_chunk_IMIM4BE2.getProjectAnalysis,
+  get_jungle: () => import_chunk_IMIM4BE2.get_jungle,
+  isErrorWithLocation: () => import_chunk_IMIM4BE2.isErrorWithLocation,
+  launchSimulator: () => import_chunk_IMIM4BE2.launchSimulator,
+  manifestProducts: () => import_chunk_IMIM4BE2.manifestProducts,
+  mctree: () => import_chunk_IMIM4BE2.mctree,
+  simulateProgram: () => import_chunk_IMIM4BE2.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_E67DP34P = require("./chunk-E67DP34P.cjs");
+var import_chunk_IMIM4BE2 = require("./chunk-IMIM4BE2.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_E67DP34P.init_optimizer)();
+(0, import_chunk_IMIM4BE2.init_optimizer)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StateNodeAttributes,

package/build/sdk-util.cjs

@@ -18,25 +18,25 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var sdk_util_exports = {};
 __export(sdk_util_exports, {
-  SectionKinds: () => import_chunk_E67DP34P.SectionKinds,
-  appSupport: () => import_chunk_E67DP34P.appSupport,
-  connectiq: () => import_chunk_E67DP34P.connectiq,
-  getDeviceInfo: () => import_chunk_E67DP34P.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_E67DP34P.getFunctionDocumentation,
-  getLanguages: () => import_chunk_E67DP34P.getLanguages,
-  getSdkPath: () => import_chunk_E67DP34P.getSdkPath,
-  isWin: () => import_chunk_E67DP34P.isWin,
-  optimizeProgram: () => import_chunk_E67DP34P.optimizeProgram,
-  readPrg: () => import_chunk_E67DP34P.readPrg,
-  readPrgWithOffsets: () => import_chunk_E67DP34P.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_E67DP34P.xml_util_exports
+  SectionKinds: () => import_chunk_IMIM4BE2.SectionKinds,
+  appSupport: () => import_chunk_IMIM4BE2.appSupport,
+  connectiq: () => import_chunk_IMIM4BE2.connectiq,
+  getDeviceInfo: () => import_chunk_IMIM4BE2.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_IMIM4BE2.getFunctionDocumentation,
+  getLanguages: () => import_chunk_IMIM4BE2.getLanguages,
+  getSdkPath: () => import_chunk_IMIM4BE2.getSdkPath,
+  isWin: () => import_chunk_IMIM4BE2.isWin,
+  optimizeProgram: () => import_chunk_IMIM4BE2.optimizeProgram,
+  readPrg: () => import_chunk_IMIM4BE2.readPrg,
+  readPrgWithOffsets: () => import_chunk_IMIM4BE2.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_IMIM4BE2.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_E67DP34P = require("./chunk-E67DP34P.cjs");
+var import_chunk_IMIM4BE2 = require("./chunk-IMIM4BE2.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_E67DP34P.init_sdk_util)();
+(0, import_chunk_IMIM4BE2.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/api.d.ts

@@ -47,6 +47,8 @@ export declare function getApiFunctionInfo(state: ProgramState, func: FunctionSt
 export declare function markInvokeClassMethod(state: ProgramStateAnalysis, func: FunctionStateNode): void;
 export declare function isLocal(v: VariableStateNode): boolean;
 export declare function isClassVariable(v: VariableStateNode): boolean;
+export declare function resolveDiagnostics(diagnostics?: PreDiagnostic[]): Promise<Diagnostic[]> | undefined;
+export declare function resolveDiagnosticsMap(diagnosticsMap: Record<string, PreDiagnostic[]>): Promise<Record<string, Diagnostic[]>>;
 export declare function diagnostic(state: ProgramState, node: mctree.Node, message: string | Promise<string> | null, type?: DiagnosticType, extra?: Diagnostic["extra"]): void;
 export declare function diagnosticHelper(diagnostics: Record<string, PreDiagnostic[]>, node: mctree.Node, message: string | Promise<string> | null, type: DiagnosticType | undefined, extra: Diagnostic["extra"] | undefined): void;
 export declare function getSuperClasses(klass: ClassStateNode): Set<StateNode> | null;

package/build/src/type-flow/types.d.ts

@@ -187,9 +187,7 @@ export declare function isSingleton(v: AbstractValue): v is SingletonType;
 export declare function hasValue(v: AbstractValue): v is WithValue<ExactTypes>;
 export declare function hasNoData(v: AbstractValue, t: TypeTag): boolean;
 export declare function cloneType<T extends ExactOrUnion>(t: T): T;
-export declare function relaxType(type: ExactOrUnion): {
-    type: number;
-};
+export declare function relaxType(type: ExactOrUnion): ExactOrUnion;
 export declare function typeFromTypeStateNode(state: ProgramStateAnalysis, sn: StateNodeDecl, classVsObj?: boolean): ExactOrUnion;
 export declare function typeFromTypeStateNodes(state: ProgramStateAnalysis, sns: StateNodeDecl[], classVsObj?: boolean): ExactOrUnion;
 export declare function objectLiteralKeyFromExpr(key: mctree.Expression): string | null;

package/build/worker-thread.cjs

@@ -21,17 +21,17 @@ __export(worker_thread_exports, {
   default: () => worker_thread_default
 });
 module.exports = __toCommonJS(worker_thread_exports);
-var import_chunk_E67DP34P = require("./chunk-E67DP34P.cjs");
+var import_chunk_IMIM4BE2 = require("./chunk-IMIM4BE2.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
 var import_node_worker_threads = require("node:worker_threads");
 var require_worker_thread = (0, import_chunk_ABYVSU2C.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_E67DP34P.init_worker_task)();
+    (0, import_chunk_IMIM4BE2.init_worker_task)();
     if (import_node_worker_threads.parentPort) {
       import_node_worker_threads.parentPort.on("message", async (task) => {
-        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_E67DP34P.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_IMIM4BE2.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.37",
+  "version": "1.1.38",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",