remove global _ const

Author: jackkav

packages/insomnia/src/common/render.ts

@@ -17,7 +17,7 @@ import type { WebSocketRequest } from '../models/websocket-request';
 import { isWorkspace, type Workspace } from '../models/workspace';
 import { getOrInheritAuthentication, getOrInheritHeaders } from '../network/network';
 import { RenderError } from '../templating/render-error';
-import { NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME, render as templateRendering } from '../templating/template-rendering';
+import { render as templateRendering } from '../templating/template-rendering';
 import type {
   BaseRenderContext,
   BaseRenderContextOptions,
@@ -442,7 +442,7 @@ export async function getRenderContext({
     }
   }
 
-  const inKey = NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME;
+  const inKey = '_';
 
   if (rootGlobalEnvironment) {
     getKeySource(rootGlobalEnvironment.data || {}, inKey, 'rootGlobal');

packages/insomnia/src/templating/template-rendering.ts

@@ -10,7 +10,6 @@ import { extractUndefinedVariableKey, RenderError } from './render-error';
 export const RENDER_ALL = 'all';
 export const RENDER_VARS = 'variables';
 export const RENDER_TAGS = 'tags';
-export const NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME = '_';
 
 type NunjucksEnvironment = Environment & {
   extensions: Record<string, any>;
@@ -48,7 +47,7 @@ export function render(
   // context needs to exist on the root for the old templating syntax, and in _ for the new templating syntax
   // old: {{ arr[0].prop }}
   // new: {{ _['arr-name-with-dash'][0].prop }}
-  const templatingContext = { ...context, [NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME]: context };
+  const templatingContext = { ...context, ['_']: context };
   const path = config.path || null;
   const renderMode = config.renderMode || RENDER_ALL;
   return new Promise<string | null>(async (resolve, reject) => {

packages/insomnia/src/ui/components/editors/__tests__/environment-editor.test.ts

@@ -1,7 +1,6 @@
 // @vitest-environment jsdom
 import { describe, expect, it } from 'vitest';
 
-import { NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME } from '../../../../templating/template-rendering';
 import { checkNestedKeys, ensureKeyIsValid } from '../environment-utils';
 
 describe('ensureKeyIsValid()', () => {
@@ -21,28 +20,11 @@ describe('ensureKeyIsValid()', () => {
     expect(ensureKeyIsValid(key, true)).toBe(`"${key}" is a reserved key`);
   });
 
-  it.each([
-    '_',
-    'a',
-    'ab',
-    'a$',
-    'a$b',
-    'a-b',
-    `a${NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME}b`,
-    `${NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME}ab`,
-  ])('"%s" should be valid as a nested key', key => {
+  it.each(['_', 'a', 'ab', 'a$', 'a$b', 'a-b', `a_b`, `_ab`])('"%s" should be valid as a nested key', key => {
     expect(ensureKeyIsValid(key, false)).toBe(null);
   });
 
-  it.each([
-    'a',
-    'ab',
-    'a$',
-    'a$b',
-    'a-b',
-    `a${NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME}b`,
-    `${NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME}ab`,
-  ])('"%s" should be valid as a root value', key => {
+  it.each(['a', 'ab', 'a$', 'a$b', 'a-b', `a_b`, `_ab`])('"%s" should be valid as a root value', key => {
     expect(ensureKeyIsValid(key, true)).toBe(null);
   });
 });

packages/insomnia/src/ui/components/editors/environment-utils.tsx

@@ -6,7 +6,6 @@ import {
   vaultEnvironmentPath,
   vaultEnvironmentRuntimePath,
 } from '../../../models/environment';
-import { NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME } from '../../../templating/template-rendering';
 import { showModal } from '../modals';
 import { AlertModal } from '../modals/alert-modal';
 import { AskModal } from '../modals/ask-modal';
@@ -20,8 +19,8 @@ export const ensureKeyIsValid = (key: string, isRoot: boolean): string | null =>
     return `"${key}" cannot begin with '$' or contain a '.'`;
   }
 
-  if (key === NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME && isRoot) {
-    return `"${NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME}" is a reserved key`;
+  if (key === '_' && isRoot) {
+    return `"_" is a reserved key`;
   }
 
   if (key === vaultEnvironmentPath && isRoot) {

packages/insomnia/src/ui/components/templating/variable-editor.tsx

@@ -1,7 +1,6 @@
 import React, { type FC, useEffect, useMemo, useState } from 'react';
 
 import { vaultEnvironmentMaskValue, vaultEnvironmentRuntimePath } from '../../../models/environment';
-import { NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME } from '../../../templating/template-rendering';
 import type { RenderPurpose } from '../../../templating/types';
 import { useNunjucks } from '../../context/nunjucks/use-nunjucks';
 
@@ -23,11 +22,7 @@ export const VariableEditor: FC<Props> = ({ onChange, defaultValue }) => {
   const [error, setError] = useState('');
   const isVaultVariable =
     selected &&
-    selected
-      .replace('{{', '')
-      .replace('}}', '')
-      .trim()
-      .startsWith(`${NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME}.${vaultEnvironmentRuntimePath}`) &&
+    selected.replace('{{', '').replace('}}', '').trim().startsWith(`_.${vaultEnvironmentRuntimePath}`) &&
     preview === vaultEnvironmentMaskValue;
 
   useEffect(() => {

packages/insomnia/src/ui/context/nunjucks/use-nunjucks.ts

@@ -3,7 +3,6 @@ import { useCallback } from 'react';
 import { getRenderContext, getRenderContextAncestors, render } from '~/common/render';
 import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId';
 import { useRequestLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId';
-import { NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME } from '~/templating/template-rendering';
 import type { HandleRender, RenderContextOptions } from '~/templating/types';
 import { getKeys } from '~/templating/utils';
 
@@ -46,7 +45,7 @@ export const useNunjucks = (options?: UseNunjucksOptions) => {
         contextCacheKey && getRenderContextPromiseCache[contextCacheKey]
           ? await getRenderContextPromiseCache[contextCacheKey]
           : await fetchRenderContext();
-      const keys = getKeys(context, NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME);
+      const keys = getKeys(context, '_');
       return { context, keys };
     },
     [fetchRenderContext],

packages/insomnia/src/ui/worker/template-rendering.ts

@@ -10,7 +10,6 @@ import { fetchFromTemplateWorkerDatabase, NunjucksExtension } from '~/ui/worker/
 export const RENDER_ALL = 'all';
 export const RENDER_VARS = 'variables';
 export const RENDER_TAGS = 'tags';
-export const NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME = '_';
 
 type NunjucksEnvironment = Environment & {
   extensions: Record<string, any>;
@@ -48,7 +47,7 @@ export function render(
   // context needs to exist on the root for the old templating syntax, and in _ for the new templating syntax
   // old: {{ arr[0].prop }}
   // new: {{ _['arr-name-with-dash'][0].prop }}
-  const templatingContext = { ...context, [NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME]: context };
+  const templatingContext = { ...context, ['_']: context };
   const path = config.path || null;
   const renderMode = config.renderMode || RENDER_ALL;
   return new Promise<string | null>(async (resolve, reject) => {