Merge Sequence Editors Time library

package.json

@@ -130,7 +130,7 @@
     "stylelint-order": "^6.0.4",
     "svelte-check": "^3.4.4",
     "tslib": "^2.6.0",
-    "typescript": "5.4.3",
+    "typescript": "5.0.4",
     "unique-names-generator": "^4.7.1",
     "vite": "5.1.6",
     "vitest": "^1.0.0"

src/components/sequencing/form/SelectedCommand.svelte

@@ -172,7 +172,7 @@
     }
   }
 
-  function hasAncestorWithId(element: Element | null, id: string) {
+  function hasAncestorWithId(element: Element | null, id: string): boolean {
     if (element === null) {
       return false;
     } else if (element.id === id) {

src/enums/time.ts

@@ -7,3 +7,11 @@ export enum TIME_MS {
   MONTH = 2629800000,
   YEAR = 31557600000,
 }
+
+export enum TimeTypes {
+  ABSOLUTE = 'absolute',
+  EPOCH = 'epoch',
+  EPOCH_SIMPLE = 'epoch_simple',
+  RELATIVE = 'relative',
+  RELATIVE_SIMPLE = 'relative_simple',
+}

src/utilities/codemirror/codemirror-utils.ts

@@ -116,7 +116,7 @@ export function isQuoted(s: string) {
 }
 
 export function unquoteUnescape(s: string) {
-  if (isQuoted(s) && s.length > 1) {
+  if (isQuoted(s)) {
     return s.slice(1, -1).replaceAll('\\"', '"');
   }
   return s;
@@ -126,6 +126,13 @@ export function quoteEscape(s: string) {
   return `"${s.replaceAll('"', '\\"')}"`;
 }
 
+export function removeQuotes(text: string | number | boolean): string | number | boolean {
+  if (typeof text === 'string') {
+    return text.replace(/\\"|"(?!\\")/g, '"').trim();
+  }
+  return text;
+}
+
 export function removeEscapedQuotes(text: string | number | boolean): string | number | boolean {
   if (typeof text === 'string') {
     return text.replace(/\\"|"(?!\\")/g, '"').trim();

src/utilities/monacoHelper.ts

@@ -13,7 +13,7 @@ export const sequenceProvideCodeActions = (
     .map(unbalancedTime => {
       const match = unbalancedTime.message.match(/Suggestion:\s*(.*)/);
       if (match) {
-        const extractSuggestedTime = match[1].replace(/\s+/g, '');
+        const extractSuggestedTime = match[1].replace(/\s+/, '').replace(/\[|\]/g, '');
         return generateQuickFixAction('Convert Unbalanced Time', extractSuggestedTime, unbalancedTime, model);
       }
       return undefined; // Return undefined when the match fails
@@ -42,7 +42,12 @@ function generateQuickFixAction(
         {
           resource: model.uri,
           textEdit: {
-            range: diagnostics,
+            range: {
+              endColumn: diagnostics.endColumn - 1,
+              endLineNumber: diagnostics.endLineNumber,
+              startColumn: diagnostics.startColumn + 2,
+              startLineNumber: diagnostics.startLineNumber,
+            },
             text: replaceText,
           },
           versionId: model.getVersionId(),

src/utilities/new-sequence-editor/sequence-completion.ts

@@ -1,6 +1,7 @@
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
 import { syntaxTree } from '@codemirror/language';
 import type { ChannelDictionary, CommandDictionary, ParameterDictionary } from '@nasa-jpl/aerie-ampcs';
+import { getDoyTime } from '../time';
 import { fswCommandArgDefault } from './command-dictionary';
 import { getCustomArgDef } from './extension-points';
 
@@ -103,9 +104,17 @@ export function sequenceCompletion(
         );
 
         if (!cursor.isTimeTagBefore) {
+          //get the first of the year date
+          const date = new Date();
+          date.setMonth(0);
+          date.setDate(1);
+          date.setHours(0);
+          date.setMinutes(0);
+          date.setSeconds(0);
+          date.setMilliseconds(0);
           timeTagCompletions.push(
             {
-              apply: 'A0000-000T00:00:00 ',
+              apply: `A${getDoyTime(date)} `,
               info: 'Execute command at an absolute time',
               label: `A (absolute)`,
               section: 'Time Tags',
@@ -119,7 +128,7 @@ export function sequenceCompletion(
               type: 'keyword',
             },
             {
-              apply: 'E+00:00:00 ',
+              apply: 'E+1 ',
               info: 'Execute command at an offset from an epoch',
               label: 'E (epoch)',
               section: 'Time Tags',