Updated to address Ryan PR comments.

Author: goetzrrGit

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@nasa-jpl/aerie-sequence-languages",
-  "version": "0.1.0-alpha.6",
+  "version": "0.1.0-alpha.7",
   "description": "Consolidated parsing for languages with first-party support in Aerie sequencing",
   "type": "module",
   "author": "NASA/JPL",

package.json

@@ -5,7 +5,7 @@ import { PhoenixResources } from 'interfaces/phoenix.js';
 
 export const SatfSasfParser = parser;
 
-export function getSatfLanguage(resources: PhoenixResources) {
+export function getSatfLRLanguage(resources: PhoenixResources) {
   return resources.LRLanguage.define({
     languageData: {
       commentTokens: { line: '#' },

src/languages/satf/grammar/satf-sasf.ts

@@ -5,7 +5,7 @@ import { SEQN_NODES } from './seqn-grammar-constants.js';
 import { fswCommandArgDefault } from '../../utils/sequence-utils.js';
 import { getDefaultVariableArgs } from '../../utils/sequence-utils.js';
 import { getFromAndTo, getNearestAncestorNodeOfType } from '../../utils/tree-utils.js';
-import { getDoyTime } from '../../utils/time.js';
+import { isoFromJSDate } from '@nasa-jpl/aerie-time-utils';
 import type { PhoenixContext } from '../../interfaces/phoenix.js';
 import type { GlobalVariable } from '../../types/global-types.js';
 import { seqnParser } from './seq-n.js';
@@ -161,7 +161,7 @@ export function seqnCompletion(
           date.setMilliseconds(0);
           timeTagCompletions.push(
             {
-              apply: `A${getDoyTime(date)} `,
+              apply: `A${isoFromJSDate(date)} `,
               info: 'Execute command at an absolute time',
               label: `A (absolute)`,
               section: 'Time Tags',
@@ -245,9 +245,7 @@ export function seqnCompletion(
       // If TimeTag has not been entered by the user wait for 2 characters before showing the command completions list
       // If TimeTag has been entered show the completion list when 1 character has been entered
       if (word.text.length > (cursor.isAfterTimeTag || cursor.isBeforeImmedOrHDWCommands === false ? 0 : 1)) {
-        fswCommandsCompletions.push(
-          ...generateCommandCompletions(cursor, phoenixContext, mapper),
-        );
+        fswCommandsCompletions.push(...generateCommandCompletions(cursor, phoenixContext, mapper));
 
         //add load, activate, ground_block, and ground_event commands
         fswCommandsCompletions.push(...generateStepCompletion(cursor));

src/languages/seq-n/seq-n-completion.ts

@@ -23,9 +23,9 @@ import {
   isHexValue,
   parseNumericArg,
 } from '../../utils/sequence-utils.js';
-import { quoteEscape } from '../../utils/string.js';
-import { pluralize } from '../../utils/text.js';
-import { getDoyTime } from '../../utils/time.js';
+import { pluralize, quoteEscape } from '../../utils/string.js';
+
+import { isoFromJSDate } from '@nasa-jpl/aerie-time-utils';
 import { getChildrenNode, getDeepestNode, getFromAndTo } from '../../utils/tree-utils.js';
 import { closeSuggestion, computeBlocks, openSuggestion } from './custom-folder.js';
 import { TOKEN_ERROR } from './seq-n-constants.js';
@@ -773,7 +773,7 @@ function validateTimeTags(command: SyntaxNode, text: string): Diagnostic[] {
             diagnostics.push({
               actions: [],
               from: timeTagAbsoluteNode.from,
-              message: ERROR_MESSAGES.UNBALANCED_TIME + getDoyTime(new Date(convertIsoToUnixEpoch(absoluteText))),
+              message: ERROR_MESSAGES.UNBALANCED_TIME + isoFromJSDate(new Date(convertIsoToUnixEpoch(absoluteText))),
               severity: 'warning',
               to: timeTagAbsoluteNode.to,
             });

src/languages/seq-n/seq-n-linter.ts

@@ -1,4 +1,4 @@
-import { isQuoted, quoteEscape, removeEscapedQuotes, unquoteUnescape } from './string.js';
+import { isQuoted, pluralize, quoteEscape, removeEscapedQuotes, unquoteUnescape } from './string.js';
 import { describe, expect, it } from 'vitest';
 
 describe(`'Escaped quotes' from input`, () => {
@@ -81,4 +81,10 @@ describe('quoteEscape', () => {
       expect(unquoteUnescape('hello"')).toBe('hello"');
     });
   });
+
+  it('pluralize', () => {
+    expect(pluralize(0)).toBe('s');
+    expect(pluralize(1)).toBe('');
+    expect(pluralize(10)).toBe('s');
+  });
 });

src/utils/string.test.ts

@@ -20,6 +20,10 @@ export function removeQuote(s: string) {
   return s;
 }
 
+export function pluralize(count: number): string {
+  return count === 1 ? '' : 's';
+}
+
 export function removeEscapedQuotes(text: string): string;
 export function removeEscapedQuotes(text: number): number;
 export function removeEscapedQuotes(text: boolean): boolean;